diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e922335c9c..cdb80445a61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - Remove redundant space for empty return in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6745
 - Remove redundant space for export in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6560
 - Remove empty export blocks in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6744
+- Fix indent for returned/thrown/wrapped in parentheses objects in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6746
 
 # 11.1.0
 
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
index 14d2d8c6787..9925968f621 100644
--- a/jscomp/core/js_dump.ml
+++ b/jscomp/core/js_dump.ml
@@ -92,9 +92,6 @@ module Curry_gen = struct
     P.string f (Printf.sprintf "%d" len)
 end
 
-let return_indent = String.length L.return / Ext_pp.indent_length
-let throw_indent = String.length L.throw / Ext_pp.indent_length
-
 type cxt = Ext_pp_scope.t
 
 let semi f = P.string f L.semi
@@ -919,7 +916,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
            var f = { x : 2 , y : 2}
          ]}
       *)
-      P.cond_paren_group f (level > 1) 1 (fun _ ->
+      P.cond_paren_group f (level > 1) 0 (fun _ ->
           if lst = [] then (
             P.string f "{}";
             cxt)
@@ -1211,7 +1208,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
       | _ ->
           return_sp f;
           (* P.string f "return ";(\* ASI -- when there is a comment*\) *)
-          P.group f return_indent (fun _ ->
+          P.group f 0 (fun _ ->
               let cxt = expression ~level:0 cxt f e in
               semi f;
               cxt)
@@ -1261,7 +1258,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
       in
       P.string f L.throw;
       P.space f;
-      P.group f throw_indent (fun _ ->
+      P.group f 0 (fun _ ->
           let cxt = expression ~level:0 cxt f e in
           semi f;
           cxt)
diff --git a/jscomp/test/406_primitive_test.js b/jscomp/test/406_primitive_test.js
index 5892abfb8fc..16bc48c89f8 100644
--- a/jscomp/test/406_primitive_test.js
+++ b/jscomp/test/406_primitive_test.js
@@ -35,10 +35,10 @@ function f(param) {
     for(var i = 0; i <= 200; ++i){
       if (i === 10) {
         throw {
-              RE_EXN_ID: A,
-              _1: 0,
-              Error: new Error()
-            };
+          RE_EXN_ID: A,
+          _1: 0,
+          Error: new Error()
+        };
       }
       
     }
diff --git a/jscomp/test/AsInUncurriedExternals.js b/jscomp/test/AsInUncurriedExternals.js
index e41fb643d26..c4478fb8398 100644
--- a/jscomp/test/AsInUncurriedExternals.js
+++ b/jscomp/test/AsInUncurriedExternals.js
@@ -4,10 +4,10 @@
 
 function mo(prim0, prim1) {
   return {
-          objectMode: false,
-          name: prim0,
-          someOther: true
-        };
+    objectMode: false,
+    name: prim0,
+    someOther: true
+  };
 }
 
 var options = {
diff --git a/jscomp/test/DerivingAccessorsCurried.js b/jscomp/test/DerivingAccessorsCurried.js
index eccd00c5182..8446560fc2f 100644
--- a/jscomp/test/DerivingAccessorsCurried.js
+++ b/jscomp/test/DerivingAccessorsCurried.js
@@ -9,17 +9,17 @@ function myField(param) {
 
 function num(param_0) {
   return {
-          TAG: "Num",
-          _0: param_0
-        };
+    TAG: "Num",
+    _0: param_0
+  };
 }
 
 function doubleNum(param_0, param_1) {
   return {
-          TAG: "DoubleNum",
-          _0: param_0,
-          _1: param_1
-        };
+    TAG: "DoubleNum",
+    _0: param_0,
+    _1: param_1
+  };
 }
 
 function compose(a, accessor) {
diff --git a/jscomp/test/DerivingAccessorsUncurried.js b/jscomp/test/DerivingAccessorsUncurried.js
index e4c47c8f179..228957605f0 100644
--- a/jscomp/test/DerivingAccessorsUncurried.js
+++ b/jscomp/test/DerivingAccessorsUncurried.js
@@ -8,17 +8,17 @@ function myField(param) {
 
 function num(param_0) {
   return {
-          TAG: "Num",
-          _0: param_0
-        };
+    TAG: "Num",
+    _0: param_0
+  };
 }
 
 function doubleNum(param_0, param_1) {
   return {
-          TAG: "DoubleNum",
-          _0: param_0,
-          _1: param_1
-        };
+    TAG: "DoubleNum",
+    _0: param_0,
+    _1: param_1
+  };
 }
 
 function compose(a, accessor) {
diff --git a/jscomp/test/EmptyRecord.js b/jscomp/test/EmptyRecord.js
index 5d56a17695a..392d5ea5fd2 100644
--- a/jscomp/test/EmptyRecord.js
+++ b/jscomp/test/EmptyRecord.js
@@ -5,8 +5,8 @@
 function construct(b) {
   if (b) {
     return {
-            n: 0
-          };
+      n: 0
+    };
   } else {
     return {};
   }
diff --git a/jscomp/test/Import.js b/jscomp/test/Import.js
index 4336162e616..756f4e22ac7 100644
--- a/jscomp/test/Import.js
+++ b/jscomp/test/Import.js
@@ -5,8 +5,8 @@ var Curry = require("../../lib/js/curry.js");
 
 async function eachIntAsync(list, f) {
   return Curry._2(await import("../../lib/js/belt_List.js").then(function (m) {
-                  return m.forEach;
-                }), list, f);
+            return m.forEach;
+          }), list, f);
 }
 
 function eachIntLazy(list, f) {
@@ -87,18 +87,18 @@ async function f2(param) {
   var M3 = await import("../../lib/js/belt_List.js");
   var M4 = await import("../../lib/js/belt_List.js");
   return [
-          M3.forEach,
-          M4.forEach
-        ];
+    M3.forEach,
+    M4.forEach
+  ];
 }
 
 async function f3(param) {
   var M3 = await import("../../lib/js/belt_List.js");
   var M4 = await import("../../lib/js/belt_List.js");
   return [
-          M3.forEach,
-          M4.forEach
-        ];
+    M3.forEach,
+    M4.forEach
+  ];
 }
 
 async function f4(param) {
@@ -109,19 +109,19 @@ async function f5(param) {
   var A = await import("../../lib/js/belt_Array.js");
   var O = await import("../../lib/js/belt_Option.js");
   return [
-          A.forEach,
-          O.forEach
-        ];
+    A.forEach,
+    O.forEach
+  ];
 }
 
 async function f6(param) {
   var MS = await import("../../lib/js/belt_MapString.js");
   var A = await import("../../lib/js/belt_Array.js");
   return [
-          0,
-          MS.forEach,
-          A.forEach
-        ];
+    0,
+    MS.forEach,
+    A.forEach
+  ];
 }
 
 async function f7(param) {
diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js
index e197d2239d2..39981149764 100644
--- a/jscomp/test/UncurriedAlways.js
+++ b/jscomp/test/UncurriedAlways.js
@@ -58,18 +58,18 @@ function inl2(x, y) {
 
 function foo$1(x, y, z) {
   return [
-          x,
-          y,
-          z
-        ];
+    x,
+    y,
+    z
+  ];
 }
 
 function ptl$1(none, extra) {
   return [
-          none,
-          "y",
-          extra
-        ];
+    none,
+    "y",
+    extra
+  ];
 }
 
 var a1 = [
@@ -89,11 +89,11 @@ var AllLabels = {
 function foo$2(x, y, z, dOpt) {
   var d = dOpt !== undefined ? dOpt : "d=0";
   return [
-          x,
-          y,
-          z,
-          d
-        ];
+    x,
+    y,
+    z,
+    d
+  ];
 }
 
 function ptl$2(none, extra, extra$1) {
@@ -122,16 +122,16 @@ function foo$3(d1Opt, x, d2Opt, y, d3Opt, z, d4Opt, w, d5Opt) {
   var d4 = d4Opt !== undefined ? d4Opt : "d4=0";
   var d5 = d5Opt !== undefined ? d5Opt : "d5=0";
   return [
-          d1,
-          x,
-          d2,
-          y,
-          d3,
-          z,
-          d4,
-          w,
-          d5
-        ];
+    d1,
+    x,
+    d2,
+    y,
+    d3,
+    z,
+    d4,
+    w,
+    d5
+  ];
 }
 
 function ptl$3(none, none$1, none$2, none$3, none$4, none$5, extra) {
@@ -175,8 +175,8 @@ function fn1(a, b, param) {
 
 function a$1(__x) {
   return fn1((function () {
-                return 1;
-              }), 2, __x);
+          return 1;
+        }), 2, __x);
 }
 
 function f3(x, y, z) {
diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js
index 651a1f3663a..ec16af52e42 100644
--- a/jscomp/test/UncurriedExternals.js
+++ b/jscomp/test/UncurriedExternals.js
@@ -5,9 +5,9 @@ var React = require("react");
 
 function dd(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var h = sum(1.0, 2.0);
@@ -75,15 +75,15 @@ var StandardNotation = {
 function methodWithAsync(param) {
   var $$this = this ;
   return (async function (arg) {
-              return $$this + arg | 0;
-            })(param);
+        return $$this + arg | 0;
+      })(param);
 }
 
 function dd$1(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var h$1 = sum(1.0, 2.0);
diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js
index 7d9c7b79d48..a856c00f62d 100644
--- a/jscomp/test/UntaggedVariants.js
+++ b/jscomp/test/UntaggedVariants.js
@@ -43,9 +43,9 @@ var ListWithObjects = {};
 function tuplesToObjects(l) {
   if (Array.isArray(l)) {
     return {
-            hd: l[0],
-            tl: tuplesToObjects(l[1])
-          };
+      hd: l[0],
+      tl: tuplesToObjects(l[1])
+    };
   } else {
     return null;
   }
@@ -191,26 +191,26 @@ function classify$6(x) {
   } else {
     if (Array.isArray(x)) {
       return {
-              TAG: "JSONArray",
-              _0: x
-            };
+        TAG: "JSONArray",
+        _0: x
+      };
     }
     switch (typeof x) {
       case "string" :
           return {
-                  TAG: "JSONString",
-                  _0: x
-                };
+            TAG: "JSONString",
+            _0: x
+          };
       case "number" :
           return {
-                  TAG: "JSONNumber",
-                  _0: x
-                };
+            TAG: "JSONNumber",
+            _0: x
+          };
       case "object" :
           return {
-                  TAG: "JSONObject",
-                  _0: x
-                };
+            TAG: "JSONObject",
+            _0: x
+          };
       
     }
   }
diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js
index ef2665e0fa7..ebf92f1c181 100644
--- a/jscomp/test/a_filename_test.js
+++ b/jscomp/test/a_filename_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/a_list_test.js b/jscomp/test/a_list_test.js
index 462476f90c5..106bb9547f7 100644
--- a/jscomp/test/a_list_test.js
+++ b/jscomp/test/a_list_test.js
@@ -8,19 +8,19 @@ var suites_0 = [
   "drop",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Ext_list_test.drop(3, {
-                    hd: 0,
-                    tl: {
-                      hd: 1,
-                      tl: {
-                        hd: 2,
-                        tl: /* [] */0
-                      }
-                    }
-                  }),
-              _1: /* [] */0
-            };
+        TAG: "Eq",
+        _0: Ext_list_test.drop(3, {
+              hd: 0,
+              tl: {
+                hd: 1,
+                tl: {
+                  hd: 2,
+                  tl: /* [] */0
+                }
+              }
+            }),
+        _1: /* [] */0
+      };
     })
 ];
 
@@ -29,22 +29,22 @@ var suites_1 = {
     "drop1",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: Ext_list_test.drop(2, {
-                      hd: 0,
-                      tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 2,
-                          tl: /* [] */0
-                        }
-                      }
-                    }),
-                _1: {
-                  hd: 2,
-                  tl: /* [] */0
+          TAG: "Eq",
+          _0: Ext_list_test.drop(2, {
+                hd: 0,
+                tl: {
+                  hd: 1,
+                  tl: {
+                    hd: 2,
+                    tl: /* [] */0
+                  }
                 }
-              };
+              }),
+          _1: {
+            hd: 2,
+            tl: /* [] */0
+          }
+        };
       })
   ],
   tl: {
@@ -52,52 +52,52 @@ var suites_1 = {
       "flat_map",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: {
-                    hd: 0,
+            TAG: "Eq",
+            _0: {
+              hd: 0,
+              tl: {
+                hd: 0,
+                tl: {
+                  hd: 1,
+                  tl: {
+                    hd: 1,
                     tl: {
                       hd: 0,
-                      tl: {
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              }
+            },
+            _1: Ext_list_test.flat_map((function (x) {
+                    if (x % 2 === 0) {
+                      return {
+                        hd: 0,
+                        tl: /* [] */0
+                      };
+                    } else {
+                      return {
                         hd: 1,
                         tl: {
                           hd: 1,
-                          tl: {
-                            hd: 0,
-                            tl: /* [] */0
-                          }
+                          tl: /* [] */0
                         }
-                      }
+                      };
                     }
-                  },
-                  _1: Ext_list_test.flat_map((function (x) {
-                          if (x % 2 === 0) {
-                            return {
-                                    hd: 0,
-                                    tl: /* [] */0
-                                  };
-                          } else {
-                            return {
-                                    hd: 1,
-                                    tl: {
-                                      hd: 1,
-                                      tl: /* [] */0
-                                    }
-                                  };
-                          }
-                        }), {
+                  }), {
+                  hd: 0,
+                  tl: {
+                    hd: 0,
+                    tl: {
+                      hd: 3,
+                      tl: {
                         hd: 0,
-                        tl: {
-                          hd: 0,
-                          tl: {
-                            hd: 3,
-                            tl: {
-                              hd: 0,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      })
-                };
+                        tl: /* [] */0
+                      }
+                    }
+                  }
+                })
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/a_string_test.js b/jscomp/test/a_string_test.js
index 97a888daca5..e66cec47a70 100644
--- a/jscomp/test/a_string_test.js
+++ b/jscomp/test/a_string_test.js
@@ -9,19 +9,19 @@ var suites_0 = [
   "split",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Ext_string_test.split(true, "hihi", /* 'i' */105),
-              _1: {
-                hd: "h",
-                tl: {
-                  hd: "h",
-                  tl: {
-                    hd: "",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            };
+        TAG: "Eq",
+        _0: Ext_string_test.split(true, "hihi", /* 'i' */105),
+        _1: {
+          hd: "h",
+          tl: {
+            hd: "h",
+            tl: {
+              hd: "",
+              tl: /* [] */0
+            }
+          }
+        }
+      };
     })
 ];
 
@@ -30,16 +30,16 @@ var suites_1 = {
     "split_non_empty",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: Ext_string_test.split(undefined, "hihi", /* 'i' */105),
-                _1: {
-                  hd: "h",
-                  tl: {
-                    hd: "h",
-                    tl: /* [] */0
-                  }
-                }
-              };
+          TAG: "Eq",
+          _0: Ext_string_test.split(undefined, "hihi", /* 'i' */105),
+          _1: {
+            hd: "h",
+            tl: {
+              hd: "h",
+              tl: /* [] */0
+            }
+          }
+        };
       })
   ],
   tl: {
@@ -47,10 +47,10 @@ var suites_1 = {
       "split_empty",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: Ext_string_test.split(true, "", /* 'i' */105),
-                  _1: /* [] */0
-                };
+            TAG: "Eq",
+            _0: Ext_string_test.split(true, "", /* 'i' */105),
+            _1: /* [] */0
+          };
         })
     ],
     tl: {
@@ -58,19 +58,19 @@ var suites_1 = {
         "split_normal",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: Ext_string_test.split(true, "h i i", /* ' ' */32),
-                    _1: {
-                      hd: "h",
-                      tl: {
-                        hd: "i",
-                        tl: {
-                          hd: "i",
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  };
+              TAG: "Eq",
+              _0: Ext_string_test.split(true, "h i i", /* ' ' */32),
+              _1: {
+                hd: "h",
+                tl: {
+                  hd: "i",
+                  tl: {
+                    hd: "i",
+                    tl: /* [] */0
+                  }
+                }
+              }
+            };
           })
       ],
       tl: {
@@ -78,30 +78,30 @@ var suites_1 = {
           "split_by",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: List.filter(function (s) {
-                              return s !== "";
-                            })(Ext_string_test.split_by(undefined, (function (x) {
-                                  if (x === /* ' ' */32) {
-                                    return true;
-                                  } else {
-                                    return x === /* '\t' */9;
-                                  }
-                                }), "h hgso hgso \t hi")),
-                      _1: {
-                        hd: "h",
-                        tl: {
-                          hd: "hgso",
-                          tl: {
-                            hd: "hgso",
-                            tl: {
-                              hd: "hi",
-                              tl: /* [] */0
+                TAG: "Eq",
+                _0: List.filter(function (s) {
+                        return s !== "";
+                      })(Ext_string_test.split_by(undefined, (function (x) {
+                            if (x === /* ' ' */32) {
+                              return true;
+                            } else {
+                              return x === /* '\t' */9;
                             }
-                          }
-                        }
+                          }), "h hgso hgso \t hi")),
+                _1: {
+                  hd: "h",
+                  tl: {
+                    hd: "hgso",
+                    tl: {
+                      hd: "hgso",
+                      tl: {
+                        hd: "hi",
+                        tl: /* [] */0
                       }
-                    };
+                    }
+                  }
+                }
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/adt_optimize_test.js b/jscomp/test/adt_optimize_test.js
index 7a1bc362290..393094c8aac 100644
--- a/jscomp/test/adt_optimize_test.js
+++ b/jscomp/test/adt_optimize_test.js
@@ -195,14 +195,14 @@ function f11(x) {
     return 1;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "adt_optimize_test.res",
-          202,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "adt_optimize_test.res",
+      202,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 exports.f = f;
diff --git a/jscomp/test/and_or_tailcall_test.js b/jscomp/test/and_or_tailcall_test.js
index 8e5a02cebd5..c77a08e9f81 100644
--- a/jscomp/test/and_or_tailcall_test.js
+++ b/jscomp/test/and_or_tailcall_test.js
@@ -35,10 +35,10 @@ var suites_0 = [
   "and_tail",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: false,
-              _1: f(true, 1, 0)
-            };
+        TAG: "Eq",
+        _0: false,
+        _1: f(true, 1, 0)
+      };
     })
 ];
 
@@ -47,10 +47,10 @@ var suites_1 = {
     "or_tail",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: false,
-                _1: or_f(false, 1, 0)
-              };
+          TAG: "Eq",
+          _0: false,
+          _1: or_f(false, 1, 0)
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/argv_test.js b/jscomp/test/argv_test.js
index f15e97a4c13..ddb4143b324 100644
--- a/jscomp/test/argv_test.js
+++ b/jscomp/test/argv_test.js
@@ -51,26 +51,26 @@ Arg.parse_argv(undefined, [
 
 if (compile.contents !== true) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "argv_test.res",
-          14,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "argv_test.res",
+      14,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (test.contents !== false) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "argv_test.res",
-          15,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "argv_test.res",
+      15,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 exports.anno_fun = anno_fun;
diff --git a/jscomp/test/ari_regress_test.js b/jscomp/test/ari_regress_test.js
index f61c720afcd..c798666753f 100644
--- a/jscomp/test/ari_regress_test.js
+++ b/jscomp/test/ari_regress_test.js
@@ -32,10 +32,10 @@ var suites_0 = [
   "curry",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: g,
-              _1: 7
-            };
+        TAG: "Eq",
+        _0: g,
+        _1: 7
+      };
     })
 ];
 
@@ -44,10 +44,10 @@ var suites_1 = {
     "curry2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 14,
-                _1: (Curry._1(v, 1), Curry._1(v, 1))
-              };
+          TAG: "Eq",
+          _0: 14,
+          _1: (Curry._1(v, 1), Curry._1(v, 1))
+        };
       })
   ],
   tl: {
@@ -55,10 +55,10 @@ var suites_1 = {
       "curry3",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: 14
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: 14
+          };
         })
     ],
     tl: {
@@ -66,10 +66,10 @@ var suites_1 = {
         "File \"ari_regress_test.res\", line 35, characters 5-12",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: h.contents,
-                    _1: 1
-                  };
+              TAG: "Eq",
+              _0: h.contents,
+              _1: 1
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/arith_lexer.js b/jscomp/test/arith_lexer.js
index ce03ea38a2c..010f5005a9c 100644
--- a/jscomp/test/arith_lexer.js
+++ b/jscomp/test/arith_lexer.js
@@ -129,14 +129,14 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
           continue ;
       case 1 :
           return {
-                  TAG: "NUMERAL",
-                  _0: Caml_format.int_of_string(Lexing.lexeme(lexbuf))
-                };
+            TAG: "NUMERAL",
+            _0: Caml_format.int_of_string(Lexing.lexeme(lexbuf))
+          };
       case 2 :
           return {
-                  TAG: "IDENT",
-                  _0: Lexing.lexeme(lexbuf)
-                };
+            TAG: "IDENT",
+            _0: Lexing.lexeme(lexbuf)
+          };
       case 3 :
           return "PLUS";
       case 4 :
diff --git a/jscomp/test/arith_parser.js b/jscomp/test/arith_parser.js
index dcbd92c374a..58d71d866e5 100644
--- a/jscomp/test/arith_parser.js
+++ b/jscomp/test/arith_parser.js
@@ -141,10 +141,10 @@ var yynames_block = "\
 var yyact = [
   (function (param) {
       throw {
-            RE_EXN_ID: "Failure",
-            _1: "parser",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Failure",
+        _1: "parser",
+        Error: new Error()
+      };
     }),
   (function (__caml_parser_env) {
       return Parsing.peek_val(__caml_parser_env, 1);
@@ -152,69 +152,69 @@ var yyact = [
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Numeral",
-              _0: _1
-            };
+        TAG: "Numeral",
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Variable",
-              _0: _1
-            };
+        TAG: "Variable",
+        _0: _1
+      };
     }),
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 2);
       var _3 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Plus",
-              _0: _1,
-              _1: _3
-            };
+        TAG: "Plus",
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 2);
       var _3 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Minus",
-              _0: _1,
-              _1: _3
-            };
+        TAG: "Minus",
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 2);
       var _3 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Times",
-              _0: _1,
-              _1: _3
-            };
+        TAG: "Times",
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       var _1 = Parsing.peek_val(__caml_parser_env, 2);
       var _3 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Divide",
-              _0: _1,
-              _1: _3
-            };
+        TAG: "Divide",
+        _0: _1,
+        _1: _3
+      };
     }),
   (function (__caml_parser_env) {
       var _2 = Parsing.peek_val(__caml_parser_env, 0);
       return {
-              TAG: "Negate",
-              _0: _2
-            };
+        TAG: "Negate",
+        _0: _2
+      };
     }),
   (function (__caml_parser_env) {
       return Parsing.peek_val(__caml_parser_env, 1);
     }),
   (function (__caml_parser_env) {
       throw {
-            RE_EXN_ID: Parsing.YYexit,
-            _1: Parsing.peek_val(__caml_parser_env, 0),
-            Error: new Error()
-          };
+        RE_EXN_ID: Parsing.YYexit,
+        _1: Parsing.peek_val(__caml_parser_env, 0),
+        Error: new Error()
+      };
     })
 ];
 
diff --git a/jscomp/test/arity_deopt.js b/jscomp/test/arity_deopt.js
index 2a175617393..c499bc2d4b5 100644
--- a/jscomp/test/arity_deopt.js
+++ b/jscomp/test/arity_deopt.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/arity_infer.js b/jscomp/test/arity_infer.js
index 2abbfa16fa7..4f443158216 100644
--- a/jscomp/test/arity_infer.js
+++ b/jscomp/test/arity_infer.js
@@ -11,18 +11,18 @@ function f0(x) {
       });
   } else {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   return tmp(3);
 }
 
 function f1(x) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
   return Curry._1(undefined, x);
 }
 
@@ -51,9 +51,9 @@ function f3(x) {
         break;
     default:
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
   }
   return tmp(3);
 }
diff --git a/jscomp/test/array_data_util.js b/jscomp/test/array_data_util.js
index 7a846581e38..32919a18607 100644
--- a/jscomp/test/array_data_util.js
+++ b/jscomp/test/array_data_util.js
@@ -5,8 +5,8 @@ var Belt_Array = require("../../lib/js/belt_Array.js");
 
 function range(i, j) {
   return Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
-                return k + i | 0;
-              }));
+          return k + i | 0;
+        }));
 }
 
 function randomRange(i, j) {
diff --git a/jscomp/test/array_subtle_test.js b/jscomp/test/array_subtle_test.js
index 12a164c4a6d..a5bc2cbaa39 100644
--- a/jscomp/test/array_subtle_test.js
+++ b/jscomp/test/array_subtle_test.js
@@ -21,10 +21,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/array_test.js b/jscomp/test/array_test.js
index a12d2f9d75e..9fb0e84aafe 100644
--- a/jscomp/test/array_test.js
+++ b/jscomp/test/array_test.js
@@ -22,9 +22,9 @@ function starts_with(xs, prefix, p) {
     for(var i = 0; i < len2; ++i){
       if (!Curry._2(p, Caml_array.get(xs, i), Caml_array.get(prefix, i))) {
         throw {
-              RE_EXN_ID: H,
-              Error: new Error()
-            };
+          RE_EXN_ID: H,
+          Error: new Error()
+        };
       }
       
     }
@@ -59,18 +59,18 @@ var array_suites_0 = [
   "init",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: $$Array.init(5, (function (x) {
-                      return x;
-                    })),
-              _1: [
-                0,
-                1,
-                2,
-                3,
-                4
-              ]
-            };
+        TAG: "Eq",
+        _0: $$Array.init(5, (function (x) {
+                return x;
+              })),
+        _1: [
+          0,
+          1,
+          2,
+          3,
+          4
+        ]
+      };
     })
 ];
 
@@ -80,14 +80,14 @@ var array_suites_1 = {
     (function (param) {
         var aux = function (xs) {
           return List.fold_left((function (acc, param) {
-                        return {
-                                hd: [
-                                  $$Array.to_list(param[0]),
-                                  param[1]
-                                ],
-                                tl: acc
-                              };
-                      }), /* [] */0, xs);
+                  return {
+                    hd: [
+                      $$Array.to_list(param[0]),
+                      param[1]
+                    ],
+                    tl: acc
+                  };
+                }), /* [] */0, xs);
         };
         var match = List.split(aux({
                   hd: [
@@ -97,10 +97,10 @@ var array_suites_1 = {
                   tl: /* [] */0
                 }));
         return {
-                TAG: "Eq",
-                _0: match[0],
-                _1: match[1]
-              };
+          TAG: "Eq",
+          _0: match[0],
+          _1: match[1]
+        };
       })
   ],
   tl: {
@@ -108,36 +108,36 @@ var array_suites_1 = {
       "concat",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: [
+            TAG: "Eq",
+            _0: [
+              0,
+              1,
+              2,
+              3,
+              4,
+              5
+            ],
+            _1: Caml_array.concat({
+                  hd: [
                     0,
                     1,
-                    2,
-                    3,
-                    4,
-                    5
+                    2
                   ],
-                  _1: Caml_array.concat({
-                        hd: [
-                          0,
-                          1,
-                          2
-                        ],
-                        tl: {
-                          hd: [
-                            3,
-                            4
-                          ],
-                          tl: {
-                            hd: [],
-                            tl: {
-                              hd: [5],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      })
-                };
+                  tl: {
+                    hd: [
+                      3,
+                      4
+                    ],
+                    tl: {
+                      hd: [],
+                      tl: {
+                        hd: [5],
+                        tl: /* [] */0
+                      }
+                    }
+                  }
+                })
+          };
         })
     ],
     tl: {
@@ -145,20 +145,20 @@ var array_suites_1 = {
         "make",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: [
-                      Caml_array.make(100, /* 'a' */97),
-                      Caml_array.make_float(100)
-                    ],
-                    _1: [
-                      $$Array.init(100, (function (param) {
-                              return /* 'a' */97;
-                            })),
-                      $$Array.init(100, (function (param) {
-                              return 0;
-                            }))
-                    ]
-                  };
+              TAG: "Eq",
+              _0: [
+                Caml_array.make(100, /* 'a' */97),
+                Caml_array.make_float(100)
+              ],
+              _1: [
+                $$Array.init(100, (function (param) {
+                        return /* 'a' */97;
+                      })),
+                $$Array.init(100, (function (param) {
+                        return 0;
+                      }))
+              ]
+            };
           })
       ],
       tl: {
@@ -166,19 +166,19 @@ var array_suites_1 = {
           "sub",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: $$Array.sub([
-                            0,
-                            1,
-                            2,
-                            3,
-                            4
-                          ], 2, 2),
-                      _1: [
-                        2,
-                        3
-                      ]
-                    };
+                TAG: "Eq",
+                _0: $$Array.sub([
+                      0,
+                      1,
+                      2,
+                      3,
+                      4
+                    ], 2, 2),
+                _1: [
+                  2,
+                  3
+                ]
+              };
             })
         ],
         tl: {
@@ -195,24 +195,24 @@ var array_suites_1 = {
                       }));
                 $$Array.blit(v, 1, u, 1, 2);
                 return {
-                        TAG: "Eq",
-                        _0: [
-                          [
-                            0,
-                            2,
-                            4
-                          ],
-                          [
-                            100,
-                            2,
-                            4
-                          ]
-                        ],
-                        _1: [
-                          v,
-                          u
-                        ]
-                      };
+                  TAG: "Eq",
+                  _0: [
+                    [
+                      0,
+                      2,
+                      4
+                    ],
+                    [
+                      100,
+                      2,
+                      4
+                    ]
+                  ],
+                  _1: [
+                    v,
+                    u
+                  ]
+                };
               })
           ],
           tl: {
@@ -224,37 +224,37 @@ var array_suites_1 = {
                         }));
                   $$Array.blit(a0, 10, a0, 5, 20);
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: starts_with(a0, [
-                                0,
-                                1,
-                                2,
-                                3,
-                                4,
-                                10,
-                                11,
-                                12,
-                                13,
-                                14,
-                                15,
-                                16,
-                                17,
-                                18,
-                                19,
-                                20,
-                                21,
-                                22,
-                                23,
-                                24,
-                                25,
-                                26,
-                                27,
-                                28
-                              ], (function (prim0, prim1) {
-                                  return prim0 === prim1;
-                                }))
-                        };
+                    TAG: "Eq",
+                    _0: true,
+                    _1: starts_with(a0, [
+                          0,
+                          1,
+                          2,
+                          3,
+                          4,
+                          10,
+                          11,
+                          12,
+                          13,
+                          14,
+                          15,
+                          16,
+                          17,
+                          18,
+                          19,
+                          20,
+                          21,
+                          22,
+                          23,
+                          24,
+                          25,
+                          26,
+                          27,
+                          28
+                        ], (function (prim0, prim1) {
+                            return prim0 === prim1;
+                          }))
+                  };
                 })
             ],
             tl: {
@@ -266,39 +266,39 @@ var array_suites_1 = {
                           }));
                     $$Array.blit(a0, 5, a0, 10, 20);
                     return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: starts_with(a0, [
-                                  0,
-                                  1,
-                                  2,
-                                  3,
-                                  4,
-                                  5,
-                                  6,
-                                  7,
-                                  8,
-                                  9,
-                                  5,
-                                  6,
-                                  7,
-                                  8,
-                                  9,
-                                  10,
-                                  11,
-                                  12,
-                                  13,
-                                  14,
-                                  15,
-                                  16,
-                                  17,
-                                  18,
-                                  19,
-                                  20
-                                ], (function (prim0, prim1) {
-                                    return prim0 === prim1;
-                                  }))
-                          };
+                      TAG: "Eq",
+                      _0: true,
+                      _1: starts_with(a0, [
+                            0,
+                            1,
+                            2,
+                            3,
+                            4,
+                            5,
+                            6,
+                            7,
+                            8,
+                            9,
+                            5,
+                            6,
+                            7,
+                            8,
+                            9,
+                            10,
+                            11,
+                            12,
+                            13,
+                            14,
+                            15,
+                            16,
+                            17,
+                            18,
+                            19,
+                            20
+                          ], (function (prim0, prim1) {
+                              return prim0 === prim1;
+                            }))
+                    };
                   })
               ],
               tl: {
@@ -306,13 +306,13 @@ var array_suites_1 = {
                   "make",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: Caml_array.make(2, 1),
-                              _1: [
-                                1,
-                                1
-                              ]
-                            };
+                        TAG: "Eq",
+                        _0: Caml_array.make(2, 1),
+                        _1: [
+                          1,
+                          1
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -326,14 +326,14 @@ var array_suites_1 = {
                         ];
                         $$Array.sort(Caml.int_compare, u);
                         return {
-                                TAG: "Eq",
-                                _0: Caml_obj.equal([
-                                      0,
-                                      1,
-                                      3
-                                    ], u),
-                                _1: true
-                              };
+                          TAG: "Eq",
+                          _0: Caml_obj.equal([
+                                0,
+                                1,
+                                3
+                              ], u),
+                          _1: true
+                        };
                       })
                   ],
                   tl: {
@@ -345,10 +345,10 @@ var array_suites_1 = {
                                 }));
                           $$Array.sort(Caml.int_compare, v);
                           return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: is_sorted(v)
-                                };
+                            TAG: "Eq",
+                            _0: true,
+                            _1: is_sorted(v)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/ast_abstract_test.js b/jscomp/test/ast_abstract_test.js
index 01ba5257a96..62381724724 100644
--- a/jscomp/test/ast_abstract_test.js
+++ b/jscomp/test/ast_abstract_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -31,18 +31,18 @@ function eq(loc, x, y) {
 
 function tToJs(param) {
   return {
-          x: param.x,
-          y: param.y,
-          z: param.z
-        };
+    x: param.x,
+    y: param.y,
+    z: param.z
+  };
 }
 
 function tFromJs(param) {
   return {
-          x: param.x,
-          y: param.y,
-          z: param.z
-        };
+    x: param.x,
+    y: param.y,
+    z: param.z
+  };
 }
 
 var v0 = {
diff --git a/jscomp/test/async_await.js b/jscomp/test/async_await.js
index d376f50acf8..74bc9836bcd 100644
--- a/jscomp/test/async_await.js
+++ b/jscomp/test/async_await.js
@@ -16,8 +16,8 @@ function Make(I) {
     return await I.get(key);
   };
   return {
-          get: get
-        };
+    get: get
+  };
 }
 
 async function topFoo() {
diff --git a/jscomp/test/async_inline.js b/jscomp/test/async_inline.js
index 1c891d0c22e..c0094bf55d7 100644
--- a/jscomp/test/async_inline.js
+++ b/jscomp/test/async_inline.js
@@ -76,8 +76,8 @@ async function nested2(param) {
 
 function onSubmit(param) {
   return React.useCallback(async function (_a, b) {
-              return await b;
-            });
+        return await b;
+      });
 }
 
 var tci = 3;
diff --git a/jscomp/test/bal_set_mini.js b/jscomp/test/bal_set_mini.js
index e97a4383323..0c032b60c2b 100644
--- a/jscomp/test/bal_set_mini.js
+++ b/jscomp/test/bal_set_mini.js
@@ -14,12 +14,12 @@ function create(l, v, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: v,
+    _2: r,
+    _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -42,12 +42,12 @@ function bal(l, v, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     return "Empty";
@@ -77,12 +77,12 @@ function compare_int(x, y) {
 function add(x, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: "Empty",
+      _3: 1
+    };
   }
   var r = x_._2;
   var v = x_._1;
diff --git a/jscomp/test/bang_primitive.js b/jscomp/test/bang_primitive.js
index 042f967d9d1..3411f211e8e 100644
--- a/jscomp/test/bang_primitive.js
+++ b/jscomp/test/bang_primitive.js
@@ -4,20 +4,20 @@
 
 function test(x, y) {
   return [
-          x < y,
-          x <= y,
-          x > y,
-          x >= y,
-          x === y,
-          x !== y
-        ];
+    x < y,
+    x <= y,
+    x > y,
+    x >= y,
+    x === y,
+    x !== y
+  ];
 }
 
 function f(x, y) {
   return [
-          String.fromCharCode.apply(null, x),
-          0
-        ];
+    String.fromCharCode.apply(null, x),
+    0
+  ];
 }
 
 exports.test = test;
diff --git a/jscomp/test/bb.js b/jscomp/test/bb.js
index 8aa3297180a..88083a93b31 100644
--- a/jscomp/test/bb.js
+++ b/jscomp/test/bb.js
@@ -22,14 +22,14 @@ function ff(x) {
         return "c";
     default:
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bb.res",
-              13,
-              9
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bb.res",
+          13,
+          9
+        ],
+        Error: new Error()
+      };
   }
 }
 
@@ -47,14 +47,14 @@ function test(x) {
         break;
     default:
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bb.res",
-              21,
-              9
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bb.res",
+          21,
+          9
+        ],
+        Error: new Error()
+      };
   }
   if (match === "b") {
     return "b";
diff --git a/jscomp/test/bdd.js b/jscomp/test/bdd.js
index 11f264f463e..48bae95cfa2 100644
--- a/jscomp/test/bdd.js
+++ b/jscomp/test/bdd.js
@@ -68,24 +68,24 @@ function resize(newSize) {
       if (typeof n !== "object") {
         if (n === "One") {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bdd.res",
-                  60,
-                  13
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "bdd.res",
+              60,
+              13
+            ],
+            Error: new Error()
+          };
         }
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "bdd.res",
-                60,
-                13
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "bdd.res",
+            60,
+            13
+          ],
+          Error: new Error()
+        };
       } else {
         var ind = hashVal(getId(n._0), getId(n._3), n._1) & newSz_1;
         Caml_array.set(newArr, ind, {
@@ -144,24 +144,24 @@ function mkNode(low, v, high) {
       if (typeof n !== "object") {
         if (n === "One") {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bdd.res",
-                  121,
-                  15
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "bdd.res",
+              121,
+              15
+            ],
+            Error: new Error()
+          };
         }
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "bdd.res",
-                121,
-                15
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "bdd.res",
+            121,
+            15
+          ],
+          Error: new Error()
+        };
       } else {
         if (v === n._1 && idl === getId(n._0) && idh === getId(n._3)) {
           return n;
@@ -401,14 +401,14 @@ function main(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bdd.res",
-          301,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bdd.res",
+      301,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 main();
diff --git a/jscomp/test/belt_internal_test.js b/jscomp/test/belt_internal_test.js
index 7580f76ea6c..a7eae4db89b 100644
--- a/jscomp/test/belt_internal_test.js
+++ b/jscomp/test/belt_internal_test.js
@@ -19,11 +19,11 @@ function copy(n) {
   var l = n.left;
   var r = n.right;
   return {
-          value: v,
-          height: h,
-          left: copy(l),
-          right: copy(r)
-        };
+    value: v,
+    height: h,
+    left: copy(l),
+    right: copy(r)
+  };
 }
 
 exports.treeHeight = treeHeight;
diff --git a/jscomp/test/bench.js b/jscomp/test/bench.js
index 38ca9b86321..d7206950d93 100644
--- a/jscomp/test/bench.js
+++ b/jscomp/test/bench.js
@@ -25,10 +25,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, f$1(0));
   for(var i = 1; i < l; ++i){
diff --git a/jscomp/test/big_polyvar_test.js b/jscomp/test/big_polyvar_test.js
index 0a95c8931e5..395a59aeeae 100644
--- a/jscomp/test/big_polyvar_test.js
+++ b/jscomp/test/big_polyvar_test.js
@@ -26,7214 +26,7214 @@ function eq(x, y) {
 
 if ("variant0" !== "variant0") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          314,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      314,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant1" !== "variant1") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          315,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      315,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant2" !== "variant2") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          316,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      316,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant3" !== "variant3") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          317,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      317,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant4" !== "variant4") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          318,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      318,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant5" !== "variant5") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          319,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      319,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant6" !== "variant6") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          320,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      320,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant7" !== "variant7") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          321,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      321,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant8" !== "variant8") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          322,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      322,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant9" !== "variant9") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          323,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      323,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant10" !== "variant10") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          324,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      324,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant11" !== "variant11") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          325,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      325,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant12" !== "variant12") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          326,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      326,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant13" !== "variant13") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          327,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      327,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant14" !== "variant14") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          328,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      328,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant15" !== "variant15") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          329,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      329,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant16" !== "variant16") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          330,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      330,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant17" !== "variant17") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          331,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      331,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant18" !== "variant18") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          332,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      332,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant19" !== "variant19") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          333,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      333,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant20" !== "variant20") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          334,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      334,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant21" !== "variant21") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          335,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      335,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant22" !== "variant22") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          336,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      336,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant23" !== "variant23") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          337,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      337,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant24" !== "variant24") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          338,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      338,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant25" !== "variant25") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          339,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      339,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant26" !== "variant26") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          340,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      340,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant27" !== "variant27") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          341,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      341,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant28" !== "variant28") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          342,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      342,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant29" !== "variant29") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          343,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      343,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant30" !== "variant30") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          344,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      344,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant31" !== "variant31") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          345,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      345,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant32" !== "variant32") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          346,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      346,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant33" !== "variant33") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          347,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      347,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant34" !== "variant34") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          348,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      348,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant35" !== "variant35") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          349,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      349,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant36" !== "variant36") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          350,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      350,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant37" !== "variant37") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          351,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      351,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant38" !== "variant38") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          352,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      352,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant39" !== "variant39") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          353,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      353,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant40" !== "variant40") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          354,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      354,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant41" !== "variant41") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          355,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      355,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant42" !== "variant42") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          356,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      356,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant43" !== "variant43") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          357,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      357,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant44" !== "variant44") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          358,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      358,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant45" !== "variant45") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          359,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      359,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant46" !== "variant46") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          360,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      360,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant47" !== "variant47") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          361,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      361,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant48" !== "variant48") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          362,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      362,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant49" !== "variant49") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          363,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      363,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant50" !== "variant50") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          364,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      364,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant51" !== "variant51") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          365,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      365,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant52" !== "variant52") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          366,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      366,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant53" !== "variant53") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          367,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      367,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant54" !== "variant54") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          368,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      368,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant55" !== "variant55") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          369,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      369,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant56" !== "variant56") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          370,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      370,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant57" !== "variant57") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          371,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      371,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant58" !== "variant58") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          372,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      372,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant59" !== "variant59") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          373,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      373,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant60" !== "variant60") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          374,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      374,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant61" !== "variant61") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          375,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      375,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant62" !== "variant62") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          376,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      376,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant63" !== "variant63") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          377,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      377,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant64" !== "variant64") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          378,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      378,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant65" !== "variant65") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          379,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      379,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant66" !== "variant66") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          380,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      380,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant67" !== "variant67") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          381,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      381,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant68" !== "variant68") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          382,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      382,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant69" !== "variant69") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          383,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      383,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant70" !== "variant70") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          384,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      384,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant71" !== "variant71") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          385,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      385,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant72" !== "variant72") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          386,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      386,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant73" !== "variant73") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          387,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      387,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant74" !== "variant74") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          388,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      388,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant75" !== "variant75") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          389,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      389,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant76" !== "variant76") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          390,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      390,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant77" !== "variant77") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          391,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      391,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant78" !== "variant78") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          392,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      392,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant79" !== "variant79") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          393,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      393,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant80" !== "variant80") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          394,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      394,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant81" !== "variant81") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          395,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      395,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant82" !== "variant82") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          396,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      396,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant83" !== "variant83") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          397,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      397,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant84" !== "variant84") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          398,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      398,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant85" !== "variant85") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          399,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      399,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant86" !== "variant86") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          400,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      400,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant87" !== "variant87") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          401,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      401,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant88" !== "variant88") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          402,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      402,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant89" !== "variant89") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          403,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      403,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant90" !== "variant90") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          404,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      404,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant91" !== "variant91") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          405,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      405,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant92" !== "variant92") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          406,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      406,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant93" !== "variant93") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          407,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      407,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant94" !== "variant94") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          408,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      408,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant95" !== "variant95") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          409,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      409,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant96" !== "variant96") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          410,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      410,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant97" !== "variant97") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          411,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      411,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant98" !== "variant98") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          412,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      412,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant99" !== "variant99") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          413,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      413,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant100" !== "variant100") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          414,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      414,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant101" !== "variant101") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          415,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      415,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant102" !== "variant102") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          416,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      416,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant103" !== "variant103") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          417,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      417,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant104" !== "variant104") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          418,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      418,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant105" !== "variant105") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          419,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      419,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant106" !== "variant106") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          420,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      420,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant107" !== "variant107") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          421,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      421,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant108" !== "variant108") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          422,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      422,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant109" !== "variant109") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          423,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      423,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant110" !== "variant110") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          424,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      424,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant111" !== "variant111") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          425,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      425,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant112" !== "variant112") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          426,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      426,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant113" !== "variant113") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          427,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      427,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant114" !== "variant114") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          428,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      428,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant115" !== "variant115") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          429,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      429,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant116" !== "variant116") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          430,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      430,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant117" !== "variant117") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          431,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      431,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant118" !== "variant118") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          432,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      432,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant119" !== "variant119") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          433,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      433,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant120" !== "variant120") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          434,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      434,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant121" !== "variant121") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          435,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      435,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant122" !== "variant122") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          436,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      436,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant123" !== "variant123") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          437,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      437,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant124" !== "variant124") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          438,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      438,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant125" !== "variant125") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          439,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      439,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant126" !== "variant126") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          440,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      440,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant127" !== "variant127") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          441,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      441,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant128" !== "variant128") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          442,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      442,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant129" !== "variant129") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          443,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      443,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant130" !== "variant130") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          444,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      444,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant131" !== "variant131") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          445,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      445,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant132" !== "variant132") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          446,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      446,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant133" !== "variant133") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          447,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      447,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant134" !== "variant134") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          448,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      448,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant135" !== "variant135") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          449,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      449,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant136" !== "variant136") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          450,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      450,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant137" !== "variant137") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          451,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      451,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant138" !== "variant138") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          452,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      452,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant139" !== "variant139") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          453,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      453,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant140" !== "variant140") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          454,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      454,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant141" !== "variant141") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          455,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      455,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant142" !== "variant142") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          456,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      456,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant143" !== "variant143") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          457,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      457,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant144" !== "variant144") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          458,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      458,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant145" !== "variant145") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          459,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      459,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant146" !== "variant146") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          460,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      460,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant147" !== "variant147") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          461,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      461,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant148" !== "variant148") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          462,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      462,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant149" !== "variant149") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          463,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      463,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant150" !== "variant150") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          464,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      464,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant151" !== "variant151") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          465,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      465,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant152" !== "variant152") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          466,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      466,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant153" !== "variant153") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          467,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      467,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant154" !== "variant154") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          468,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      468,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant155" !== "variant155") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          469,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      469,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant156" !== "variant156") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          470,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      470,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant157" !== "variant157") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          471,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      471,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant158" !== "variant158") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          472,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      472,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant159" !== "variant159") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          473,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      473,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant160" !== "variant160") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          474,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      474,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant161" !== "variant161") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          475,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      475,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant162" !== "variant162") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          476,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      476,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant163" !== "variant163") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          477,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      477,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant164" !== "variant164") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          478,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      478,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant165" !== "variant165") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          479,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      479,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant166" !== "variant166") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          480,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      480,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant167" !== "variant167") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          481,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      481,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant168" !== "variant168") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          482,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      482,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant169" !== "variant169") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          483,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      483,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant170" !== "variant170") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          484,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      484,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant171" !== "variant171") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          485,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      485,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant172" !== "variant172") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          486,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      486,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant173" !== "variant173") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          487,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      487,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant174" !== "variant174") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          488,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      488,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant175" !== "variant175") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          489,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      489,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant176" !== "variant176") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          490,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      490,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant177" !== "variant177") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          491,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      491,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant178" !== "variant178") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          492,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      492,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant179" !== "variant179") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          493,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      493,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant180" !== "variant180") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          494,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      494,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant181" !== "variant181") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          495,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      495,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant182" !== "variant182") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          496,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      496,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant183" !== "variant183") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          497,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      497,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant184" !== "variant184") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          498,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      498,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant185" !== "variant185") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          499,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      499,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant186" !== "variant186") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          500,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      500,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant187" !== "variant187") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          501,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      501,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant188" !== "variant188") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          502,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      502,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant189" !== "variant189") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          503,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      503,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant190" !== "variant190") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          504,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      504,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant191" !== "variant191") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          505,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      505,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant192" !== "variant192") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          506,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      506,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant193" !== "variant193") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          507,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      507,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant194" !== "variant194") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          508,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      508,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant195" !== "variant195") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          509,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      509,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant196" !== "variant196") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          510,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      510,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant197" !== "variant197") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          511,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      511,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant198" !== "variant198") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          512,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      512,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant199" !== "variant199") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          513,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      513,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant200" !== "variant200") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          514,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      514,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant201" !== "variant201") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          515,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      515,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant202" !== "variant202") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          516,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      516,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant203" !== "variant203") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          517,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      517,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant204" !== "variant204") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          518,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      518,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant205" !== "variant205") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          519,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      519,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant206" !== "variant206") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          520,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      520,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant207" !== "variant207") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          521,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      521,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant208" !== "variant208") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          522,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      522,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant209" !== "variant209") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          523,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      523,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant210" !== "variant210") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          524,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      524,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant211" !== "variant211") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          525,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      525,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant212" !== "variant212") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          526,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      526,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant213" !== "variant213") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          527,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      527,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant214" !== "variant214") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          528,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      528,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant215" !== "variant215") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          529,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      529,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant216" !== "variant216") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          530,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      530,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant217" !== "variant217") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          531,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      531,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant218" !== "variant218") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          532,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      532,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant219" !== "variant219") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          533,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      533,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant220" !== "variant220") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          534,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      534,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant221" !== "variant221") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          535,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      535,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant222" !== "variant222") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          536,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      536,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant223" !== "variant223") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          537,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      537,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant224" !== "variant224") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          538,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      538,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant225" !== "variant225") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          539,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      539,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant226" !== "variant226") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          540,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      540,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant227" !== "variant227") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          541,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      541,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant228" !== "variant228") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          542,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      542,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant229" !== "variant229") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          543,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      543,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant230" !== "variant230") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          544,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      544,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant231" !== "variant231") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          545,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      545,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant232" !== "variant232") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          546,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      546,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant233" !== "variant233") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          547,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      547,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant234" !== "variant234") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          548,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      548,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant235" !== "variant235") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          549,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      549,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant236" !== "variant236") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          550,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      550,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant237" !== "variant237") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          551,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      551,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant238" !== "variant238") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          552,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      552,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant239" !== "variant239") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          553,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      553,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant240" !== "variant240") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          554,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      554,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant241" !== "variant241") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          555,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      555,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant242" !== "variant242") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          556,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      556,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant243" !== "variant243") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          557,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      557,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant244" !== "variant244") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          558,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      558,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant245" !== "variant245") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          559,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      559,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant246" !== "variant246") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          560,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      560,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant247" !== "variant247") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          561,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      561,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant248" !== "variant248") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          562,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      562,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant249" !== "variant249") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          563,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      563,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant250" !== "variant250") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          564,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      564,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant251" !== "variant251") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          565,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      565,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant252" !== "variant252") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          566,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      566,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant253" !== "variant253") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          567,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      567,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant254" !== "variant254") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          568,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      568,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant255" !== "variant255") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          569,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      569,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant256" !== "variant256") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          570,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      570,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant257" !== "variant257") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          571,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      571,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant258" !== "variant258") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          572,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      572,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant259" !== "variant259") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          573,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      573,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant260" !== "variant260") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          574,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      574,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant261" !== "variant261") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          575,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      575,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant262" !== "variant262") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          576,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      576,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant263" !== "variant263") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          577,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      577,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant264" !== "variant264") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          578,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      578,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant265" !== "variant265") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          579,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      579,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant266" !== "variant266") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          580,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      580,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant267" !== "variant267") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          581,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      581,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant268" !== "variant268") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          582,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      582,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant269" !== "variant269") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          583,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      583,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant270" !== "variant270") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          584,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      584,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant271" !== "variant271") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          585,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      585,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant272" !== "variant272") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          586,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      586,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant273" !== "variant273") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          587,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      587,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant274" !== "variant274") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          588,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      588,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant275" !== "variant275") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          589,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      589,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant276" !== "variant276") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          590,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      590,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant277" !== "variant277") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          591,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      591,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant278" !== "variant278") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          592,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      592,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant279" !== "variant279") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          593,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      593,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant280" !== "variant280") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          594,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      594,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant281" !== "variant281") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          595,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      595,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant282" !== "variant282") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          596,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      596,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant283" !== "variant283") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          597,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      597,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant284" !== "variant284") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          598,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      598,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant285" !== "variant285") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          599,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      599,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant286" !== "variant286") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          600,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      600,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant287" !== "variant287") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          601,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      601,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant288" !== "variant288") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          602,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      602,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant289" !== "variant289") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          603,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      603,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant290" !== "variant290") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          604,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      604,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant291" !== "variant291") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          605,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      605,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant292" !== "variant292") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          606,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      606,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant293" !== "variant293") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          607,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      607,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant294" !== "variant294") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          608,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      608,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant295" !== "variant295") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          609,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      609,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant296" !== "variant296") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          610,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      610,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant297" !== "variant297") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          611,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      611,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant298" !== "variant298") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          612,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      612,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if ("variant299" !== "variant299") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          613,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      613,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant0"), "variant0")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          614,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      614,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant1"), "variant1")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          615,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      615,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant2"), "variant2")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          616,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      616,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant3"), "variant3")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          617,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      617,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant4"), "variant4")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          618,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      618,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant5"), "variant5")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          619,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      619,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant6"), "variant6")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          620,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      620,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant7"), "variant7")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          621,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      621,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant8"), "variant8")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          622,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      622,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant9"), "variant9")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          623,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      623,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant10"), "variant10")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          624,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      624,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant11"), "variant11")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          625,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      625,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant12"), "variant12")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          626,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      626,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant13"), "variant13")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          627,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      627,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant14"), "variant14")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          628,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      628,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant15"), "variant15")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          629,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      629,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant16"), "variant16")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          630,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      630,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant17"), "variant17")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          631,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      631,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant18"), "variant18")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          632,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      632,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant19"), "variant19")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          633,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      633,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant20"), "variant20")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          634,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      634,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant21"), "variant21")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          635,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      635,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant22"), "variant22")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          636,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      636,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant23"), "variant23")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          637,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      637,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant24"), "variant24")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          638,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      638,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant25"), "variant25")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          639,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      639,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant26"), "variant26")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          640,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      640,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant27"), "variant27")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          641,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      641,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant28"), "variant28")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          642,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      642,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant29"), "variant29")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          643,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      643,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant30"), "variant30")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          644,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      644,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant31"), "variant31")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          645,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      645,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant32"), "variant32")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          646,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      646,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant33"), "variant33")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          647,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      647,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant34"), "variant34")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          648,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      648,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant35"), "variant35")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          649,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      649,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant36"), "variant36")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          650,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      650,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant37"), "variant37")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          651,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      651,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant38"), "variant38")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          652,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      652,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant39"), "variant39")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          653,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      653,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant40"), "variant40")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          654,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      654,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant41"), "variant41")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          655,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      655,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant42"), "variant42")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          656,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      656,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant43"), "variant43")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          657,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      657,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant44"), "variant44")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          658,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      658,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant45"), "variant45")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          659,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      659,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant46"), "variant46")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          660,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      660,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant47"), "variant47")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          661,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      661,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant48"), "variant48")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          662,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      662,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant49"), "variant49")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          663,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      663,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant50"), "variant50")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          664,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      664,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant51"), "variant51")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          665,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      665,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant52"), "variant52")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          666,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      666,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant53"), "variant53")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          667,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      667,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant54"), "variant54")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          668,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      668,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant55"), "variant55")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          669,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      669,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant56"), "variant56")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          670,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      670,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant57"), "variant57")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          671,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      671,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant58"), "variant58")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          672,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      672,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant59"), "variant59")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          673,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      673,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant60"), "variant60")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          674,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      674,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant61"), "variant61")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          675,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      675,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant62"), "variant62")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          676,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      676,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant63"), "variant63")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          677,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      677,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant64"), "variant64")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          678,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      678,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant65"), "variant65")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          679,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      679,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant66"), "variant66")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          680,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      680,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant67"), "variant67")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          681,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      681,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant68"), "variant68")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          682,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      682,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant69"), "variant69")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          683,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      683,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant70"), "variant70")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          684,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      684,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant71"), "variant71")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          685,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      685,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant72"), "variant72")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          686,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      686,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant73"), "variant73")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          687,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      687,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant74"), "variant74")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          688,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      688,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant75"), "variant75")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          689,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      689,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant76"), "variant76")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          690,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      690,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant77"), "variant77")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          691,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      691,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant78"), "variant78")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          692,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      692,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant79"), "variant79")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          693,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      693,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant80"), "variant80")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          694,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      694,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant81"), "variant81")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          695,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      695,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant82"), "variant82")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          696,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      696,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant83"), "variant83")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          697,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      697,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant84"), "variant84")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          698,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      698,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant85"), "variant85")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          699,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      699,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant86"), "variant86")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          700,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      700,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant87"), "variant87")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          701,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      701,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant88"), "variant88")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          702,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      702,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant89"), "variant89")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          703,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      703,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant90"), "variant90")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          704,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      704,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant91"), "variant91")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          705,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      705,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant92"), "variant92")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          706,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      706,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant93"), "variant93")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          707,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      707,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant94"), "variant94")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          708,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      708,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant95"), "variant95")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          709,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      709,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant96"), "variant96")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          710,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      710,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant97"), "variant97")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          711,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      711,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant98"), "variant98")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          712,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      712,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant99"), "variant99")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          713,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      713,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant100"), "variant100")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          714,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      714,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant101"), "variant101")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          715,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      715,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant102"), "variant102")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          716,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      716,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant103"), "variant103")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          717,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      717,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant104"), "variant104")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          718,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      718,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant105"), "variant105")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          719,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      719,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant106"), "variant106")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          720,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      720,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant107"), "variant107")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          721,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      721,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant108"), "variant108")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          722,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      722,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant109"), "variant109")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          723,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      723,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant110"), "variant110")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          724,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      724,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant111"), "variant111")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          725,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      725,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant112"), "variant112")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          726,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      726,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant113"), "variant113")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          727,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      727,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant114"), "variant114")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          728,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      728,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant115"), "variant115")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          729,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      729,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant116"), "variant116")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          730,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      730,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant117"), "variant117")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          731,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      731,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant118"), "variant118")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          732,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      732,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant119"), "variant119")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          733,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      733,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant120"), "variant120")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          734,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      734,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant121"), "variant121")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          735,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      735,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant122"), "variant122")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          736,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      736,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant123"), "variant123")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          737,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      737,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant124"), "variant124")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          738,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      738,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant125"), "variant125")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          739,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      739,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant126"), "variant126")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          740,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      740,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant127"), "variant127")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          741,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      741,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant128"), "variant128")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          742,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      742,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant129"), "variant129")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          743,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      743,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant130"), "variant130")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          744,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      744,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant131"), "variant131")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          745,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      745,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant132"), "variant132")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          746,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      746,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant133"), "variant133")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          747,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      747,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant134"), "variant134")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          748,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      748,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant135"), "variant135")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          749,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      749,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant136"), "variant136")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          750,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      750,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant137"), "variant137")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          751,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      751,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant138"), "variant138")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          752,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      752,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant139"), "variant139")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          753,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      753,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant140"), "variant140")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          754,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      754,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant141"), "variant141")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          755,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      755,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant142"), "variant142")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          756,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      756,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant143"), "variant143")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          757,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      757,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant144"), "variant144")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          758,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      758,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant145"), "variant145")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          759,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      759,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant146"), "variant146")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          760,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      760,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant147"), "variant147")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          761,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      761,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant148"), "variant148")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          762,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      762,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant149"), "variant149")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          763,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      763,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant150"), "variant150")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          764,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      764,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant151"), "variant151")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          765,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      765,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant152"), "variant152")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          766,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      766,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant153"), "variant153")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          767,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      767,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant154"), "variant154")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          768,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      768,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant155"), "variant155")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          769,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      769,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant156"), "variant156")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          770,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      770,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant157"), "variant157")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          771,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      771,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant158"), "variant158")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          772,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      772,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant159"), "variant159")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          773,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      773,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant160"), "variant160")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          774,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      774,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant161"), "variant161")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          775,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      775,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant162"), "variant162")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          776,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      776,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant163"), "variant163")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          777,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      777,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant164"), "variant164")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          778,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      778,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant165"), "variant165")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          779,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      779,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant166"), "variant166")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          780,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      780,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant167"), "variant167")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          781,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      781,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant168"), "variant168")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          782,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      782,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant169"), "variant169")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          783,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      783,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant170"), "variant170")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          784,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      784,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant171"), "variant171")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          785,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      785,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant172"), "variant172")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          786,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      786,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant173"), "variant173")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          787,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      787,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant174"), "variant174")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          788,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      788,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant175"), "variant175")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          789,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      789,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant176"), "variant176")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          790,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      790,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant177"), "variant177")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          791,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      791,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant178"), "variant178")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          792,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      792,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant179"), "variant179")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          793,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      793,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant180"), "variant180")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          794,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      794,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant181"), "variant181")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          795,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      795,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant182"), "variant182")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          796,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      796,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant183"), "variant183")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          797,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      797,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant184"), "variant184")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          798,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      798,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant185"), "variant185")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          799,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      799,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant186"), "variant186")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          800,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      800,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant187"), "variant187")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          801,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      801,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant188"), "variant188")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          802,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      802,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant189"), "variant189")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          803,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      803,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant190"), "variant190")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          804,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      804,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant191"), "variant191")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          805,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      805,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant192"), "variant192")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          806,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      806,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant193"), "variant193")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          807,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      807,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant194"), "variant194")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          808,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      808,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant195"), "variant195")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          809,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      809,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant196"), "variant196")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          810,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      810,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant197"), "variant197")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          811,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      811,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant198"), "variant198")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          812,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      812,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant199"), "variant199")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          813,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      813,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant200"), "variant200")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          814,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      814,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant201"), "variant201")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          815,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      815,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant202"), "variant202")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          816,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      816,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant203"), "variant203")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          817,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      817,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant204"), "variant204")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          818,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      818,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant205"), "variant205")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          819,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      819,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant206"), "variant206")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          820,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      820,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant207"), "variant207")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          821,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      821,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant208"), "variant208")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          822,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      822,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant209"), "variant209")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          823,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      823,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant210"), "variant210")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          824,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      824,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant211"), "variant211")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          825,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      825,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant212"), "variant212")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          826,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      826,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant213"), "variant213")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          827,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      827,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant214"), "variant214")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          828,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      828,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant215"), "variant215")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          829,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      829,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant216"), "variant216")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          830,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      830,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant217"), "variant217")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          831,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      831,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant218"), "variant218")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          832,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      832,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant219"), "variant219")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          833,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      833,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant220"), "variant220")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          834,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      834,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant221"), "variant221")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          835,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      835,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant222"), "variant222")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          836,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      836,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant223"), "variant223")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          837,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      837,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant224"), "variant224")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          838,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      838,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant225"), "variant225")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          839,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      839,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant226"), "variant226")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          840,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      840,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant227"), "variant227")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          841,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      841,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant228"), "variant228")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          842,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      842,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant229"), "variant229")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          843,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      843,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant230"), "variant230")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          844,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      844,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant231"), "variant231")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          845,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      845,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant232"), "variant232")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          846,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      846,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant233"), "variant233")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          847,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      847,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant234"), "variant234")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          848,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      848,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant235"), "variant235")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          849,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      849,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant236"), "variant236")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          850,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      850,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant237"), "variant237")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          851,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      851,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant238"), "variant238")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          852,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      852,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant239"), "variant239")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          853,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      853,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant240"), "variant240")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          854,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      854,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant241"), "variant241")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          855,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      855,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant242"), "variant242")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          856,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      856,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant243"), "variant243")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          857,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      857,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant244"), "variant244")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          858,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      858,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant245"), "variant245")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          859,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      859,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant246"), "variant246")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          860,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      860,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant247"), "variant247")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          861,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      861,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant248"), "variant248")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          862,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      862,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant249"), "variant249")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          863,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      863,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant250"), "variant250")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          864,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      864,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant251"), "variant251")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          865,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      865,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant252"), "variant252")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          866,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      866,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant253"), "variant253")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          867,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      867,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant254"), "variant254")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          868,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      868,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant255"), "variant255")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          869,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      869,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant256"), "variant256")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          870,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      870,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant257"), "variant257")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          871,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      871,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant258"), "variant258")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          872,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      872,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant259"), "variant259")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          873,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      873,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant260"), "variant260")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          874,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      874,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant261"), "variant261")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          875,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      875,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant262"), "variant262")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          876,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      876,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant263"), "variant263")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          877,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      877,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant264"), "variant264")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          878,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      878,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant265"), "variant265")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          879,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      879,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant266"), "variant266")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          880,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      880,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant267"), "variant267")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          881,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      881,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant268"), "variant268")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          882,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      882,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant269"), "variant269")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          883,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      883,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant270"), "variant270")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          884,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      884,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant271"), "variant271")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          885,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      885,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant272"), "variant272")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          886,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      886,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant273"), "variant273")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          887,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      887,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant274"), "variant274")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          888,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      888,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant275"), "variant275")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          889,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      889,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant276"), "variant276")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          890,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      890,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant277"), "variant277")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          891,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      891,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant278"), "variant278")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          892,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      892,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant279"), "variant279")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          893,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      893,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant280"), "variant280")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          894,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      894,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant281"), "variant281")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          895,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      895,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant282"), "variant282")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          896,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      896,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant283"), "variant283")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          897,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      897,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant284"), "variant284")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          898,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      898,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant285"), "variant285")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          899,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      899,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant286"), "variant286")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          900,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      900,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant287"), "variant287")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          901,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      901,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant288"), "variant288")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          902,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      902,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant289"), "variant289")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          903,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      903,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant290"), "variant290")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          904,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      904,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant291"), "variant291")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          905,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      905,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant292"), "variant292")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          906,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      906,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant293"), "variant293")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          907,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      907,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant294"), "variant294")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          908,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      908,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant295"), "variant295")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          909,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      909,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant296"), "variant296")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          910,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      910,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant297"), "variant297")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          911,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      911,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant298"), "variant298")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          912,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      912,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("variant299"), "variant299")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          913,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      913,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (!eq(tFromJs("xx"), undefined)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          914,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "big_polyvar_test.res",
+      914,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 exports.tToJs = tToJs;
diff --git a/jscomp/test/bs_array_test.js b/jscomp/test/bs_array_test.js
index 08205ad63eb..edc4ee7425b 100644
--- a/jscomp/test/bs_array_test.js
+++ b/jscomp/test/bs_array_test.js
@@ -38,10 +38,10 @@ function neq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Neq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -141,14 +141,14 @@ var v$1 = [
 
 if (!Belt_Array.set(v$1, 0, 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_array_test.res",
-          51,
-          6
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_array_test.res",
+      51,
+      6
+    ],
+    Error: new Error()
+  };
 }
 
 b("File \"bs_array_test.res\", line 48, characters 4-11", Belt_Array.getExn(v$1, 0) === 0);
@@ -160,14 +160,14 @@ var v$2 = [
 
 if (!Belt_Array.set(v$2, 1, 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_array_test.res",
-          59,
-          6
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_array_test.res",
+      59,
+      6
+    ],
+    Error: new Error()
+  };
 }
 
 b("File \"bs_array_test.res\", line 56, characters 4-11", Belt_Array.getExn(v$2, 1) === 0);
@@ -393,14 +393,14 @@ function addone(x) {
 function makeMatrixExn(sx, sy, init) {
   if (!(sx >= 0 && sy >= 0)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_array_test.res",
-            153,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_array_test.res",
+        153,
+        2
+      ],
+      Error: new Error()
+    };
   }
   var res = new Array(sx);
   for(var x = 0; x < sx; ++x){
diff --git a/jscomp/test/bs_auto_uncurry.js b/jscomp/test/bs_auto_uncurry.js
index 23121c9c299..a5814f178b5 100644
--- a/jscomp/test/bs_auto_uncurry.js
+++ b/jscomp/test/bs_auto_uncurry.js
@@ -19,11 +19,11 @@ var xbs = Array.prototype.map.call([
 
 function f(cb) {
   return Array.prototype.map.call([
-              1,
-              2,
-              3,
-              4
-            ], Curry.__1(cb));
+        1,
+        2,
+        3,
+        4
+      ], Curry.__1(cb));
 }
 
 var xs = Array.prototype.map.call([
@@ -38,25 +38,25 @@ var xs = Array.prototype.map.call([
 
 function f_0(param) {
   return hi(function (param) {
-              
-            });
+        
+      });
 }
 
 function f_01(param) {
   return hi(function (x) {
-              if (x === undefined) {
-                console.log("x");
-                return;
-              }
-              
-            });
+        if (x === undefined) {
+          console.log("x");
+          return;
+        }
+        
+      });
 }
 
 function f_02(xs) {
   return hi(function (x) {
-              xs.contents = x;
-              console.log("x");
-            });
+        xs.contents = x;
+        console.log("x");
+      });
 }
 
 function f_03(xs, u) {
@@ -82,26 +82,26 @@ function add3(x, y, z) {
 
 function h2(x) {
   return ff(x, (function (prim0, prim1) {
-                return prim0 + prim1 | 0;
-              }));
+          return prim0 + prim1 | 0;
+        }));
 }
 
 function h3(x) {
   return ff(x, (function (param, param$1) {
-                return add3(1, param, param$1);
-              }));
+          return add3(1, param, param$1);
+        }));
 }
 
 function h4(x) {
   return ff1(x, 3, (function (param, param$1) {
-                return add3(1, param, param$1);
-              }));
+          return add3(1, param, param$1);
+        }));
 }
 
 function h5(x) {
   return ff2(x, "3", (function (param, param$1) {
-                return add3(2, param, param$1);
-              }));
+          return add3(2, param, param$1);
+        }));
 }
 
 function add(x, y) {
diff --git a/jscomp/test/bs_auto_uncurry_test.js b/jscomp/test/bs_auto_uncurry_test.js
index f3a65302d3c..f20547212c1 100644
--- a/jscomp/test/bs_auto_uncurry_test.js
+++ b/jscomp/test/bs_auto_uncurry_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/bs_float_test.js b/jscomp/test/bs_float_test.js
index e124c86d489..2322ef8c009 100644
--- a/jscomp/test/bs_float_test.js
+++ b/jscomp/test/bs_float_test.js
@@ -31,10 +31,10 @@ function neq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Neq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/bs_hashtbl_string_test.js
index f7db2750828..ed2ab79b2be 100644
--- a/jscomp/test/bs_hashtbl_string_test.js
+++ b/jscomp/test/bs_hashtbl_string_test.js
@@ -52,14 +52,14 @@ function bench(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashMap.has(empty, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              37,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          37,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -74,14 +74,14 @@ function bench2(m) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashMap.has(empty, String(i$1))) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              61,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          61,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -92,14 +92,14 @@ function bench2(m) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          66,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      66,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function bench3(m) {
@@ -112,14 +112,14 @@ function bench3(m) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_MapDict.has(table, String(i$1), cmp)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              81,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          81,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -130,14 +130,14 @@ function bench3(m) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      86,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var Sx = Belt_Id.comparable(Caml.string_compare);
@@ -150,14 +150,14 @@ function bench4(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashMapString.has(table, String(i$1))) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              98,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          98,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -168,14 +168,14 @@ function bench4(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          103,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      103,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function bench5(param) {
@@ -189,14 +189,14 @@ function bench5(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashMap.has(table, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              119,
-              6
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          119,
+          6
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -210,14 +210,14 @@ function bench5(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          127,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      127,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function bench6(param) {
@@ -228,14 +228,14 @@ function bench6(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashMapInt.has(table, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              138,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          138,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -246,14 +246,14 @@ function bench6(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      143,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function bench7(param) {
@@ -264,14 +264,14 @@ function bench7(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_HashSetInt.has(table, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              160,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_hashtbl_string_test.res",
+          160,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -282,14 +282,14 @@ function bench7(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          170,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_hashtbl_string_test.res",
+      170,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.time("bs_hashtbl_string_test.res 181");
diff --git a/jscomp/test/bs_ignore_effect.js b/jscomp/test/bs_ignore_effect.js
index 7b2e9394b91..06a86d8fc55 100644
--- a/jscomp/test/bs_ignore_effect.js
+++ b/jscomp/test/bs_ignore_effect.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/bs_int_test.js b/jscomp/test/bs_int_test.js
index 3f7a90d22ba..8ba8800a0f1 100644
--- a/jscomp/test/bs_int_test.js
+++ b/jscomp/test/bs_int_test.js
@@ -31,10 +31,10 @@ function neq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Neq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/bs_list_test.js b/jscomp/test/bs_list_test.js
index 788934f3c56..0aa415b6d1e 100644
--- a/jscomp/test/bs_list_test.js
+++ b/jscomp/test/bs_list_test.js
@@ -1587,12 +1587,12 @@ eq("File \"bs_list_test.res\", line 260, characters 5-12", Belt_List.map({
           }
         }, (function (i) {
             return Belt_List.getExn({
-                        hd: 0,
-                        tl: {
-                          hd: 1,
-                          tl: /* [] */0
-                        }
-                      }, i);
+                  hd: 0,
+                  tl: {
+                    hd: 1,
+                    tl: /* [] */0
+                  }
+                }, i);
           })), {
       hd: 0,
       tl: {
diff --git a/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/bs_map_set_dict_test.js
index 25c8beb3ffa..a3d19ae5a93 100644
--- a/jscomp/test/bs_map_set_dict_test.js
+++ b/jscomp/test/bs_map_set_dict_test.js
@@ -114,18 +114,18 @@ function $eq$tilde(a, b) {
 
 var u0 = f(Belt_Array.map(Array_data_util.randomRange(0, 39), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 var u1 = Belt_Map.set(u0, 39, 120);
 
 b("File \"bs_map_set_dict_test.res\", line 72, characters 4-11", Belt_Array.every2(Belt_MapDict.toArray(u0.data), Belt_Array.map(Array_data_util.range(0, 39), (function (x) {
                 return [
-                        x,
-                        x
-                      ];
+                  x,
+                  x
+                ];
               })), (function (param, param$1) {
             if (param[0] === param$1[0]) {
               return param[1] === param$1[1];
@@ -136,9 +136,9 @@ b("File \"bs_map_set_dict_test.res\", line 72, characters 4-11", Belt_Array.ever
 
 b("File \"bs_map_set_dict_test.res\", line 79, characters 4-11", Belt_List.every2(Belt_MapDict.toList(u0.data), Belt_List.fromArray(Belt_Array.map(Array_data_util.range(0, 39), (function (x) {
                     return [
-                            x,
-                            x
-                          ];
+                      x,
+                      x
+                    ];
                   }))), (function (param, param$1) {
             if (param[0] === param$1[0]) {
               return param[1] === param$1[1];
@@ -153,16 +153,16 @@ eq("File \"bs_map_set_dict_test.res\", line 85, characters 5-12", Belt_Map.get(u
 
 var u = f(Belt_Array.makeByAndShuffle(10000, (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 eq("File \"bs_map_set_dict_test.res\", line 90, characters 5-12", Belt_Array.makeBy(10000, (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })), Belt_MapDict.toArray(u.data));
 
 Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents);
diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js
index ac204f9f7fc..a94fb08ecd1 100644
--- a/jscomp/test/bs_map_test.js
+++ b/jscomp/test/bs_map_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -38,9 +38,9 @@ function b(loc, v) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: v
-                };
+            TAG: "Ok",
+            _0: v
+          };
         })
     ],
     tl: suites.contents
@@ -57,9 +57,9 @@ function emptyMap(param) {
 
 var v = Belt_Array.makeByAndShuffle(1000000, (function (i) {
         return [
-                i,
-                i
-              ];
+          i,
+          i
+        ];
       }));
 
 var u = Belt_MapInt.fromArray(v);
diff --git a/jscomp/test/bs_poly_map_test.js b/jscomp/test/bs_poly_map_test.js
index 07accf3b4f6..0ea395f0a21 100644
--- a/jscomp/test/bs_poly_map_test.js
+++ b/jscomp/test/bs_poly_map_test.js
@@ -39,9 +39,9 @@ function setOfArray(x) {
 
 function emptyMap(param) {
   return {
-          cmp: Icmp.cmp,
-          data: undefined
-        };
+    cmp: Icmp.cmp,
+    data: undefined
+  };
 }
 
 function mergeInter(s1, s2) {
@@ -76,11 +76,11 @@ function mergeDiff(s1, s2) {
 
 function randomRange(i, j) {
   return Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
+          return [
+            x,
+            x
+          ];
+        }));
 }
 
 var u0 = Belt_Map.fromArray(randomRange(0, 100), Icmp);
@@ -169,14 +169,14 @@ eq("File \"bs_poly_map_test.res\", line 109, characters 5-12", Belt_Map.get(u0$1
 
 function acc(m, is) {
   return Belt_Array.reduce(is, m, (function (a, i) {
-                return Belt_Map.update(a, i, (function (n) {
-                              if (n !== undefined) {
-                                return n + 1 | 0;
-                              } else {
-                                return 1;
-                              }
-                            }));
-              }));
+          return Belt_Map.update(a, i, (function (n) {
+                  if (n !== undefined) {
+                    return n + 1 | 0;
+                  } else {
+                    return 1;
+                  }
+                }));
+        }));
 }
 
 var m_cmp = Icmp.cmp;
@@ -190,9 +190,9 @@ var m1 = acc(m, Belt_Array.concat(Array_data_util.randomRange(0, 20), Array_data
 
 b("File \"bs_poly_map_test.res\", line 126, characters 4-11", Belt_Map.eq(m1, Belt_Map.fromArray(Belt_Array.makeBy(31, (function (i) {
                     return [
-                            i,
-                            i >= 10 && i <= 20 ? 2 : 1
-                          ];
+                      i,
+                      i >= 10 && i <= 20 ? 2 : 1
+                    ];
                   })), Icmp), (function (x, y) {
             return x === y;
           })));
@@ -206,16 +206,16 @@ var v0 = {
 
 var v1 = Belt_Map.mergeMany(v0, Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })));
 
 var v2 = Belt_Map.fromArray(Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
             return [
-                    x,
-                    x
-                  ];
+              x,
+              x
+            ];
           })), Icmp);
 
 b("File \"bs_poly_map_test.res\", line 150, characters 4-11", Belt_Map.eq(v1, v2, (function (x, y) {
diff --git a/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/bs_poly_mutable_map_test.js
index 1237d06ae11..314cb7a4d8e 100644
--- a/jscomp/test/bs_poly_mutable_map_test.js
+++ b/jscomp/test/bs_poly_mutable_map_test.js
@@ -38,11 +38,11 @@ function ff(x) {
 
 function randomRange(i, j) {
   return Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
+          return [
+            x,
+            x
+          ];
+        }));
 }
 
 var a0 = Belt_MutableMap.fromArray(randomRange(0, 10), Icmp);
diff --git a/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/bs_poly_mutable_set_test.js
index a2a1a92556a..1cff8858bf7 100644
--- a/jscomp/test/bs_poly_mutable_set_test.js
+++ b/jscomp/test/bs_poly_mutable_set_test.js
@@ -34,9 +34,9 @@ function fromArray(param) {
 
 function empty(param) {
   return {
-          cmp: IntCmp.cmp,
-          data: undefined
-        };
+    cmp: IntCmp.cmp,
+    data: undefined
+  };
 }
 
 var u = fromArray(Array_data_util.range(0, 30));
diff --git a/jscomp/test/bs_qualified.js b/jscomp/test/bs_qualified.js
index b040211d88c..af827d22328 100644
--- a/jscomp/test/bs_qualified.js
+++ b/jscomp/test/bs_qualified.js
@@ -13,10 +13,10 @@ function f(a, b, c) {
 
 function f2(param) {
   return [
-          Z.a0.a1.a2.hi,
-          a0.a1.a2.ho,
-          Math.imul(1, 2)
-        ];
+    Z.a0.a1.a2.hi,
+    a0.a1.a2.ho,
+    Math.imul(1, 2)
+  ];
 }
 
 function f3(x) {
diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js
index 7c55cc79c1c..e62b95136c4 100644
--- a/jscomp/test/bs_queue_test.js
+++ b/jscomp/test/bs_queue_test.js
@@ -46,26 +46,26 @@ var q = {
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          25,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      25,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 1), q)), [1]) && q.length === 1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          26,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      26,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 2), q)), [
@@ -73,14 +73,14 @@ if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 2), q))
           2
         ]) && q.length === 2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          27,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      27,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 3), q)), [
@@ -89,14 +89,14 @@ if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 3), q))
           3
         ]) && q.length === 3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          28,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      28,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 4), q)), [
@@ -106,26 +106,26 @@ if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 4), q))
           4
         ]) && q.length === 4)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          29,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      29,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          30,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      30,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
@@ -134,26 +134,26 @@ if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
           4
         ]) && q.length === 3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          31,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      31,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          32,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      32,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
@@ -161,74 +161,74 @@ if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
           4
         ]) && q.length === 2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          33,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      33,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          34,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      34,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [4]) && q.length === 1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          35,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      35,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q) !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          36,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      36,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          37,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      37,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.popExn, q)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      38,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$1 = {
@@ -239,62 +239,62 @@ var q$1 = {
 
 if (Belt_MutableQueue.popExn((Belt_MutableQueue.add(q$1, 1), q$1)) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      43,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.popExn, q$1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      44,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn((Belt_MutableQueue.add(q$1, 2), q$1)) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      45,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.popExn, q$1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      46,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          47,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      47,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$2 = {
@@ -305,134 +305,134 @@ var q$2 = {
 
 if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 1), q$2)) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          52,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      52,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 2), q$2)) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          53,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      53,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 3), q$2)) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          54,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      54,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.peekExn(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          55,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      55,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          56,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      56,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.peekExn(q$2) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      57,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q$2) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      58,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.peekExn(q$2) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          59,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      59,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.popExn(q$2) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          60,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      60,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.peekExn, q$2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          61,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      61,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.peekExn, q$2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          62,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      62,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$3 = {
@@ -449,26 +449,26 @@ Belt_MutableQueue.clear(q$3);
 
 if (q$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          71,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      71,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Belt_MutableQueue.popExn, q$3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          72,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      72,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(q$3, {
@@ -477,28 +477,28 @@ if (!Caml_obj.equal(q$3, {
         last: undefined
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          73,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      73,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Belt_MutableQueue.add(q$3, 42);
 
 if (Belt_MutableQueue.popExn(q$3) !== 42) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      75,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1 = {
@@ -526,14 +526,14 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1), [
         10
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          84,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      84,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2), [
@@ -549,51 +549,51 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2), [
         10
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          85,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      85,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q1.length !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      86,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2.length !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          87,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      87,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 for(var i$2 = 1; i$2 <= 10; ++i$2){
   if (Belt_MutableQueue.popExn(q1) !== i$2) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            89,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        89,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -601,14 +601,14 @@ for(var i$2 = 1; i$2 <= 10; ++i$2){
 for(var i$3 = 1; i$3 <= 10; ++i$3){
   if (Belt_MutableQueue.popExn(q2) !== i$3) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            92,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        92,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -621,39 +621,39 @@ var q$4 = {
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          98,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      98,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 for(var i$4 = 1; i$4 <= 10; ++i$4){
   Belt_MutableQueue.add(q$4, i$4);
   if (q$4.length !== i$4) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            101,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        101,
+        4
+      ],
+      Error: new Error()
+    };
   }
   if (q$4.length === 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            102,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        102,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -661,51 +661,51 @@ for(var i$4 = 1; i$4 <= 10; ++i$4){
 for(var i$5 = 10; i$5 >= 1; --i$5){
   if (q$4.length !== i$5) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            105,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        105,
+        4
+      ],
+      Error: new Error()
+    };
   }
   if (q$4.length === 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            106,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "bs_queue_test.res",
+        106,
+        4
+      ],
+      Error: new Error()
+    };
   }
   Belt_MutableQueue.popExn(q$4);
 }
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          109,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      109,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          110,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      110,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$5 = {
@@ -725,14 +725,14 @@ var i$7 = {
 Belt_MutableQueue.forEach(q$5, (function (j) {
         if (i$7.contents !== j) {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bs_queue_test.res",
-                  120,
-                  4
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "bs_queue_test.res",
+              120,
+              4
+            ],
+            Error: new Error()
+          };
         }
         i$7.contents = i$7.contents + 1 | 0;
       }));
@@ -751,100 +751,100 @@ var q2$1 = {
 
 if (q1$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          127,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      127,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$1), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          128,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      128,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          129,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      129,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$1), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          130,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      130,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Belt_MutableQueue.transfer(q1$1, q2$1);
 
 if (q1$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          132,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      132,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$1), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          133,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      133,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          134,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      134,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$1), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          135,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      135,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$2 = {
@@ -865,14 +865,14 @@ for(var i$8 = 1; i$8 <= 4; ++i$8){
 
 if (q1$2.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      143,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$2), [
@@ -882,76 +882,76 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$2), [
         4
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      144,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$2.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          145,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      145,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      146,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Belt_MutableQueue.transfer(q1$2, q2$2);
 
 if (q1$2.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      148,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$2), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      149,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$2.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          150,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      150,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [
@@ -961,14 +961,14 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [
         4
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          151,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      151,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$3 = {
@@ -989,38 +989,38 @@ for(var i$9 = 5; i$9 <= 8; ++i$9){
 
 if (q1$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      159,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$3), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      160,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$3.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          161,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      161,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
@@ -1030,52 +1030,52 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
         8
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      162,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Belt_MutableQueue.transfer(q1$3, q2$3);
 
 if (q1$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      164,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$3), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      165,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$3.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          166,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      166,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
@@ -1085,14 +1085,14 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
         8
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          167,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      167,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$4 = {
@@ -1117,14 +1117,14 @@ for(var i$11 = 5; i$11 <= 8; ++i$11){
 
 if (q1$4.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      178,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [
@@ -1134,26 +1134,26 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [
         4
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          179,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      179,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$4.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          180,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      180,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$4), [
@@ -1163,40 +1163,40 @@ if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$4), [
         8
       ])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          181,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      181,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Belt_MutableQueue.transfer(q1$4, q2$4);
 
 if (q1$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          183,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      183,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [])) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          184,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      184,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var v = [
@@ -1212,26 +1212,26 @@ var v = [
 
 if (q2$4.length !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          186,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      186,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$4), v)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          187,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      187,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) {
@@ -1240,14 +1240,14 @@ if (Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) {
           return x - y | 0;
         }))) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          189,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_queue_test.res",
+      189,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.log("OK");
diff --git a/jscomp/test/bs_rbset_int_bench.js b/jscomp/test/bs_rbset_int_bench.js
index b4f14d70adb..baff8a0d8d7 100644
--- a/jscomp/test/bs_rbset_int_bench.js
+++ b/jscomp/test/bs_rbset_int_bench.js
@@ -14,14 +14,14 @@ function bench(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Rbset.mem(i$1, data)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_rbset_int_bench.res",
-              13,
-              6
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_rbset_int_bench.res",
+          13,
+          6
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -35,14 +35,14 @@ function bench(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_rbset_int_bench.res",
-          21,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_rbset_int_bench.res",
+      21,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.time("bs_rbset_int_bench.res 24");
diff --git a/jscomp/test/bs_set_bench.js b/jscomp/test/bs_set_bench.js
index 0454ff5de2b..61a57afab93 100644
--- a/jscomp/test/bs_set_bench.js
+++ b/jscomp/test/bs_set_bench.js
@@ -14,14 +14,14 @@ function bench(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Belt_SetInt.has(data, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_set_bench.res",
-              13,
-              6
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "bs_set_bench.res",
+          13,
+          6
+        ],
+        Error: new Error()
+      };
     }
     
   }
@@ -35,14 +35,14 @@ function bench(param) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_set_bench.res",
-          21,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "bs_set_bench.res",
+      21,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.time("bs_set_bench.res 24");
diff --git a/jscomp/test/bs_set_int_test.js b/jscomp/test/bs_set_int_test.js
index 77c7589ca00..c356c462f8d 100644
--- a/jscomp/test/bs_set_int_test.js
+++ b/jscomp/test/bs_set_int_test.js
@@ -56,14 +56,14 @@ b("File \"bs_set_int_test.res\", line 27, characters 11-18", Belt_SetInt.eq(Belt
 
 function range(i, j) {
   return $$Array.init((j - i | 0) + 1 | 0, (function (k) {
-                return k + i | 0;
-              }));
+          return k + i | 0;
+        }));
 }
 
 function revRange(i, j) {
   return $$Array.of_list(List.rev($$Array.to_list($$Array.init((j - i | 0) + 1 | 0, (function (k) {
-                            return k + i | 0;
-                          })))));
+                      return k + i | 0;
+                    })))));
 }
 
 var v = Belt_SetInt.fromArray($$Array.append(range(100, 1000), revRange(400, 1500)));
diff --git a/jscomp/test/bs_stack_test.js b/jscomp/test/bs_stack_test.js
index 1cde971cdfc..71b1582de7b 100644
--- a/jscomp/test/bs_stack_test.js
+++ b/jscomp/test/bs_stack_test.js
@@ -104,10 +104,10 @@ function inOrder2(v) {
 
 function n(l, r, a) {
   return {
-          value: a,
-          left: Js_undefined.fromOption(l),
-          right: Js_undefined.fromOption(r)
-        };
+    value: a,
+    left: Js_undefined.fromOption(l),
+    right: Js_undefined.fromOption(r)
+  };
 }
 
 var test1 = n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), Caml_option.some(n(undefined, undefined, 5)), 2)), Caml_option.some(n(undefined, undefined, 3)), 1);
diff --git a/jscomp/test/bs_string_test.js b/jscomp/test/bs_string_test.js
index 2c5686d1d51..5e0c2226f8e 100644
--- a/jscomp/test/bs_string_test.js
+++ b/jscomp/test/bs_string_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/bs_unwrap_test.js b/jscomp/test/bs_unwrap_test.js
index b020cf41f4b..328c8374719 100644
--- a/jscomp/test/bs_unwrap_test.js
+++ b/jscomp/test/bs_unwrap_test.js
@@ -91,10 +91,10 @@ function ff1(x, p) {
 
 function test00(param) {
   return {
-          a: 1,
-          b: 2,
-          x: undefined
-        };
+    a: 1,
+    b: 2,
+    x: undefined
+  };
 }
 
 var none_arg;
diff --git a/jscomp/test/buffer_test.js b/jscomp/test/buffer_test.js
index 03d605d6841..21c640ac5f8 100644
--- a/jscomp/test/buffer_test.js
+++ b/jscomp/test/buffer_test.js
@@ -13,16 +13,16 @@ var suites_0 = [
   "equal",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: [
-                Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0),
-                Bytes.make(3, /* 'a' */97)[0]
-              ],
-              _1: [
-                /* 'a' */97,
-                /* 'a' */97
-              ]
-            };
+        TAG: "Eq",
+        _0: [
+          Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0),
+          Bytes.make(3, /* 'a' */97)[0]
+        ],
+        _1: [
+          /* 'a' */97,
+          /* 'a' */97
+        ]
+      };
     })
 ];
 
@@ -33,16 +33,16 @@ var suites_1 = {
         var u = Bytes.make(3, /* 'a' */97);
         u[0] = /* 'b' */98;
         return {
-                TAG: "Eq",
-                _0: [
-                  u[0],
-                  Caml_string.get(v, 0)
-                ],
-                _1: [
-                  /* 'b' */98,
-                  /* 'g' */103
-                ]
-              };
+          TAG: "Eq",
+          _0: [
+            u[0],
+            Caml_string.get(v, 0)
+          ],
+          _1: [
+            /* 'b' */98,
+            /* 'g' */103
+          ]
+        };
       })
   ],
   tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
             $$Buffer.add_string(v, String(i));
           }
           return {
-                  TAG: "Eq",
-                  _0: $$Buffer.contents(v),
-                  _1: "012345678910"
-                };
+            TAG: "Eq",
+            _0: $$Buffer.contents(v),
+            _1: "012345678910"
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/bytes_split_gpr_743_test.js
index f0ffd0537d0..278f2792dc8 100644
--- a/jscomp/test/bytes_split_gpr_743_test.js
+++ b/jscomp/test/bytes_split_gpr_743_test.js
@@ -22,10 +22,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/caml_compare_bigint_test.js b/jscomp/test/caml_compare_bigint_test.js
index ab3ad10d88e..598914e697d 100644
--- a/jscomp/test/caml_compare_bigint_test.js
+++ b/jscomp/test/caml_compare_bigint_test.js
@@ -7,207 +7,204 @@ var Pervasives = require("../../lib/js/pervasives.js");
 
 function isLessThan(title, small, big) {
   return {
+    hd: [
+      "compare: " + title,
+      (function (param) {
+          return {
+            TAG: "Eq",
+            _0: true,
+            _1: Caml_obj.compare(big, small) > 0
+          };
+        })
+    ],
+    tl: {
+      hd: [
+        "compare: " + title,
+        (function (param) {
+            return {
+              TAG: "Eq",
+              _0: true,
+              _1: Caml_obj.compare(small, big) < 0
+            };
+          })
+      ],
+      tl: {
+        hd: [
+          "< operator: " + title,
+          (function (param) {
+              return {
+                TAG: "Eq",
+                _0: true,
+                _1: Caml_obj.lessthan(small, big)
+              };
+            })
+        ],
+        tl: {
           hd: [
-            "compare: " + title,
+            "<= operator: " + title,
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Caml_obj.compare(big, small) > 0
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: Caml_obj.lessequal(small, big)
+                };
               })
           ],
           tl: {
             hd: [
-              "compare: " + title,
+              "> operator: " + title,
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.compare(small, big) < 0
-                        };
+                    TAG: "Eq",
+                    _0: true,
+                    _1: Caml_obj.greaterthan(big, small)
+                  };
                 })
             ],
             tl: {
               hd: [
-                "< operator: " + title,
+                ">= operator: " + title,
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: Caml_obj.lessthan(small, big)
-                          };
+                      TAG: "Eq",
+                      _0: true,
+                      _1: Caml_obj.greaterequal(big, small)
+                    };
                   })
               ],
               tl: {
                 hd: [
-                  "<= operator: " + title,
+                  "min: " + title,
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.lessequal(small, big)
-                            };
+                        TAG: "Eq",
+                        _0: small,
+                        _1: Caml_obj.min(big, small)
+                      };
                     })
                 ],
                 tl: {
                   hd: [
-                    "> operator: " + title,
+                    "min: " + title,
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: Caml_obj.greaterthan(big, small)
-                              };
+                          TAG: "Eq",
+                          _0: small,
+                          _1: Caml_obj.min(small, big)
+                        };
                       })
                   ],
                   tl: {
                     hd: [
-                      ">= operator: " + title,
+                      "max: " + title,
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: Caml_obj.greaterequal(big, small)
-                                };
+                            TAG: "Eq",
+                            _0: big,
+                            _1: Caml_obj.max(big, small)
+                          };
                         })
                     ],
                     tl: {
                       hd: [
-                        "min: " + title,
+                        "max: " + title,
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: small,
-                                    _1: Caml_obj.min(big, small)
-                                  };
+                              TAG: "Eq",
+                              _0: big,
+                              _1: Caml_obj.max(small, big)
+                            };
                           })
                       ],
                       tl: {
                         hd: [
-                          "min: " + title,
+                          "!== operator: " + title,
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: small,
-                                      _1: Caml_obj.min(small, big)
-                                    };
+                                TAG: "Eq",
+                                _0: true,
+                                _1: big !== small
+                              };
                             })
                         ],
                         tl: {
                           hd: [
-                            "max: " + title,
+                            "!== operator: " + title,
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: big,
-                                        _1: Caml_obj.max(big, small)
-                                      };
+                                  TAG: "Eq",
+                                  _0: true,
+                                  _1: small !== big
+                                };
                               })
                           ],
                           tl: {
                             hd: [
-                              "max: " + title,
+                              "!= operator: " + title,
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: big,
-                                          _1: Caml_obj.max(small, big)
-                                        };
+                                    TAG: "Eq",
+                                    _0: true,
+                                    _1: Caml_obj.notequal(big, small)
+                                  };
                                 })
                             ],
                             tl: {
                               hd: [
-                                "!== operator: " + title,
+                                "!= operator: " + title,
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: big !== small
-                                          };
+                                      TAG: "Eq",
+                                      _0: true,
+                                      _1: Caml_obj.notequal(small, big)
+                                    };
                                   })
                               ],
                               tl: {
                                 hd: [
-                                  "!== operator: " + title,
+                                  "== operator: " + title,
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: true,
-                                              _1: small !== big
-                                            };
+                                        TAG: "Eq",
+                                        _0: false,
+                                        _1: Caml_obj.equal(big, small)
+                                      };
                                     })
                                 ],
                                 tl: {
                                   hd: [
-                                    "!= operator: " + title,
+                                    "== operator: " + title,
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Caml_obj.notequal(big, small)
-                                              };
+                                          TAG: "Eq",
+                                          _0: false,
+                                          _1: Caml_obj.equal(small, big)
+                                        };
                                       })
                                   ],
                                   tl: {
                                     hd: [
-                                      "!= operator: " + title,
+                                      "=== operator: " + title,
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: true,
-                                                  _1: Caml_obj.notequal(small, big)
-                                                };
+                                            TAG: "Eq",
+                                            _0: false,
+                                            _1: big === small
+                                          };
                                         })
                                     ],
                                     tl: {
                                       hd: [
-                                        "== operator: " + title,
+                                        "=== operator: " + title,
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: false,
-                                                    _1: Caml_obj.equal(big, small)
-                                                  };
+                                              TAG: "Eq",
+                                              _0: false,
+                                              _1: small === big
+                                            };
                                           })
                                       ],
-                                      tl: {
-                                        hd: [
-                                          "== operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: false,
-                                                      _1: Caml_obj.equal(small, big)
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "=== operator: " + title,
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: false,
-                                                        _1: big === small
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "=== operator: " + title,
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: false,
-                                                          _1: small === big
-                                                        };
-                                                })
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
+                                      tl: /* [] */0
                                     }
                                   }
                                 }
@@ -222,96 +219,132 @@ function isLessThan(title, small, big) {
               }
             }
           }
-        };
+        }
+      }
+    }
+  };
 }
 
 function isEqual(title, num1, num2) {
   return {
+    hd: [
+      "< operator: " + title,
+      (function (param) {
+          return {
+            TAG: "Eq",
+            _0: false,
+            _1: Caml_obj.lessthan(num2, num1)
+          };
+        })
+    ],
+    tl: {
+      hd: [
+        "<= operator: " + title,
+        (function (param) {
+            return {
+              TAG: "Eq",
+              _0: true,
+              _1: Caml_obj.lessequal(num2, num1)
+            };
+          })
+      ],
+      tl: {
+        hd: [
+          "> operator: " + title,
+          (function (param) {
+              return {
+                TAG: "Eq",
+                _0: false,
+                _1: Caml_obj.greaterthan(num1, num2)
+              };
+            })
+        ],
+        tl: {
           hd: [
-            "< operator: " + title,
+            ">= operator: " + title,
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Caml_obj.lessthan(num2, num1)
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: Caml_obj.greaterequal(num1, num2)
+                };
               })
           ],
           tl: {
             hd: [
-              "<= operator: " + title,
+              "min: " + title,
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.lessequal(num2, num1)
-                        };
+                    TAG: "Eq",
+                    _0: num1,
+                    _1: Caml_obj.min(num1, num2)
+                  };
                 })
             ],
             tl: {
               hd: [
-                "> operator: " + title,
+                "max: " + title,
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: Caml_obj.greaterthan(num1, num2)
-                          };
+                      TAG: "Eq",
+                      _0: num1,
+                      _1: Caml_obj.max(num1, num2)
+                    };
                   })
               ],
               tl: {
                 hd: [
-                  ">= operator: " + title,
+                  "compare: " + title,
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.greaterequal(num1, num2)
-                            };
+                        TAG: "Eq",
+                        _0: 0,
+                        _1: Caml_obj.compare(num1, num2)
+                      };
                     })
                 ],
                 tl: {
                   hd: [
-                    "min: " + title,
+                    "compare: " + title,
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: num1,
-                                _1: Caml_obj.min(num1, num2)
-                              };
+                          TAG: "Eq",
+                          _0: 0,
+                          _1: Caml_obj.compare(num2, num1)
+                        };
                       })
                   ],
                   tl: {
                     hd: [
-                      "max: " + title,
+                      "!= operator: " + title,
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: num1,
-                                  _1: Caml_obj.max(num1, num2)
-                                };
+                            TAG: "Eq",
+                            _0: false,
+                            _1: num1 !== num2
+                          };
                         })
                     ],
                     tl: {
                       hd: [
-                        "compare: " + title,
+                        "!= operator: " + title,
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: 0,
-                                    _1: Caml_obj.compare(num1, num2)
-                                  };
+                              TAG: "Eq",
+                              _0: false,
+                              _1: num2 !== num1
+                            };
                           })
                       ],
                       tl: {
                         hd: [
-                          "compare: " + title,
+                          "!= operator: " + title,
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: 0,
-                                      _1: Caml_obj.compare(num2, num1)
-                                    };
+                                TAG: "Eq",
+                                _0: false,
+                                _1: Caml_obj.notequal(num1, num2)
+                              };
                             })
                         ],
                         tl: {
@@ -319,93 +352,57 @@ function isEqual(title, num1, num2) {
                             "!= operator: " + title,
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: num1 !== num2
-                                      };
+                                  TAG: "Eq",
+                                  _0: false,
+                                  _1: Caml_obj.notequal(num2, num1)
+                                };
                               })
                           ],
                           tl: {
                             hd: [
-                              "!= operator: " + title,
+                              "== operator: " + title,
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: num2 !== num1
-                                        };
+                                    TAG: "Eq",
+                                    _0: true,
+                                    _1: Caml_obj.equal(num1, num2)
+                                  };
                                 })
                             ],
                             tl: {
                               hd: [
-                                "!= operator: " + title,
+                                "== operator: " + title,
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: false,
-                                            _1: Caml_obj.notequal(num1, num2)
-                                          };
+                                      TAG: "Eq",
+                                      _0: true,
+                                      _1: Caml_obj.equal(num2, num1)
+                                    };
                                   })
                               ],
                               tl: {
                                 hd: [
-                                  "!= operator: " + title,
+                                  "=== operator: " + title,
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: Caml_obj.notequal(num2, num1)
-                                            };
+                                        TAG: "Eq",
+                                        _0: true,
+                                        _1: num1 === num2
+                                      };
                                     })
                                 ],
                                 tl: {
                                   hd: [
-                                    "== operator: " + title,
+                                    "=== operator: " + title,
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Caml_obj.equal(num1, num2)
-                                              };
+                                          TAG: "Eq",
+                                          _0: true,
+                                          _1: num2 === num1
+                                        };
                                       })
                                   ],
-                                  tl: {
-                                    hd: [
-                                      "== operator: " + title,
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: true,
-                                                  _1: Caml_obj.equal(num2, num1)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "=== operator: " + title,
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: true,
-                                                    _1: num1 === num2
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "=== operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: true,
-                                                      _1: num2 === num1
-                                                    };
-                                            })
-                                        ],
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
+                                  tl: /* [] */0
                                 }
                               }
                             }
@@ -418,7 +415,10 @@ function isEqual(title, num1, num2) {
               }
             }
           }
-        };
+        }
+      }
+    }
+  };
 }
 
 var five = BigInt("5");
diff --git a/jscomp/test/caml_compare_test.js b/jscomp/test/caml_compare_test.js
index f39304506a9..0ee723edd0f 100644
--- a/jscomp/test/caml_compare_test.js
+++ b/jscomp/test/caml_compare_test.js
@@ -25,10 +25,10 @@ var suites = {
       "File \"caml_compare_test.res\", line 12, characters 5-12",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: Caml_obj.lessthan(undefined, 1)
-                };
+            TAG: "Eq",
+            _0: true,
+            _1: Caml_obj.lessthan(undefined, 1)
+          };
         })
     ],
     tl: {
@@ -36,10 +36,10 @@ var suites = {
         "option2",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: Caml_obj.lessthan(1, 2)
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: Caml_obj.lessthan(1, 2)
+            };
           })
       ],
       tl: {
@@ -47,13 +47,13 @@ var suites = {
           "File \"caml_compare_test.res\", line 14, characters 5-12",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Caml_obj.greaterthan({
-                            hd: 1,
-                            tl: /* [] */0
-                          }, /* [] */0)
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: Caml_obj.greaterthan({
+                      hd: 1,
+                      tl: /* [] */0
+                    }, /* [] */0)
+              };
             })
         ],
         tl: {
@@ -61,28 +61,28 @@ var suites = {
             "listeq",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Caml_obj.equal({
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            }, {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            })
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: Caml_obj.equal({
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      }, {
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      })
+                };
               })
           ],
           tl: {
@@ -90,28 +90,28 @@ var suites = {
               "listneq",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.greaterthan({
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 3,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              }, {
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 2,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              })
-                        };
+                    TAG: "Eq",
+                    _0: true,
+                    _1: Caml_obj.greaterthan({
+                          hd: 1,
+                          tl: {
+                            hd: 2,
+                            tl: {
+                              hd: 3,
+                              tl: /* [] */0
+                            }
+                          }
+                        }, {
+                          hd: 1,
+                          tl: {
+                            hd: 2,
+                            tl: {
+                              hd: 2,
+                              tl: /* [] */0
+                            }
+                          }
+                        })
+                  };
                 })
             ],
             tl: {
@@ -119,38 +119,38 @@ var suites = {
                 "custom_u",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: Caml_obj.greaterthan([
-                                  {
-                                    TAG: "A",
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: "B",
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: "C",
-                                    _0: 1
-                                  }
-                                ], [
-                                  {
-                                    TAG: "A",
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: "B",
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: "C",
-                                    _0: 0
-                                  }
-                                ])
-                          };
+                      TAG: "Eq",
+                      _0: true,
+                      _1: Caml_obj.greaterthan([
+                            {
+                              TAG: "A",
+                              _0: 3
+                            },
+                            {
+                              TAG: "B",
+                              _0: 2,
+                              _1: false
+                            },
+                            {
+                              TAG: "C",
+                              _0: 1
+                            }
+                          ], [
+                            {
+                              TAG: "A",
+                              _0: 3
+                            },
+                            {
+                              TAG: "B",
+                              _0: 2,
+                              _1: false
+                            },
+                            {
+                              TAG: "C",
+                              _0: 0
+                            }
+                          ])
+                    };
                   })
               ],
               tl: {
@@ -158,38 +158,38 @@ var suites = {
                   "custom_u2",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.equal([
-                                    {
-                                      TAG: "A",
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: "B",
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: "C",
-                                      _0: 1
-                                    }
-                                  ], [
-                                    {
-                                      TAG: "A",
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: "B",
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: "C",
-                                      _0: 1
-                                    }
-                                  ])
-                            };
+                        TAG: "Eq",
+                        _0: true,
+                        _1: Caml_obj.equal([
+                              {
+                                TAG: "A",
+                                _0: 3
+                              },
+                              {
+                                TAG: "B",
+                                _0: 2,
+                                _1: false
+                              },
+                              {
+                                TAG: "C",
+                                _0: 1
+                              }
+                            ], [
+                              {
+                                TAG: "A",
+                                _0: 3
+                              },
+                              {
+                                TAG: "B",
+                                _0: 2,
+                                _1: false
+                              },
+                              {
+                                TAG: "C",
+                                _0: 1
+                              }
+                            ])
+                      };
                     })
                 ],
                 tl: {
@@ -197,10 +197,10 @@ var suites = {
                     "function",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: function_equal_test
-                              };
+                          TAG: "Eq",
+                          _0: true,
+                          _1: function_equal_test
+                        };
                       })
                   ],
                   tl: {
@@ -208,10 +208,10 @@ var suites = {
                       "File \"caml_compare_test.res\", line 20, characters 5-12",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: Caml_obj.lessthan(undefined, 1)
-                                };
+                            TAG: "Eq",
+                            _0: true,
+                            _1: Caml_obj.lessthan(undefined, 1)
+                          };
                         })
                     ],
                     tl: {
@@ -219,13 +219,13 @@ var suites = {
                         "File \"caml_compare_test.res\", line 21, characters 5-12",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: true,
-                                    _1: Caml_obj.lessthan(undefined, [
-                                          1,
-                                          30
-                                        ])
-                                  };
+                              TAG: "Eq",
+                              _0: true,
+                              _1: Caml_obj.lessthan(undefined, [
+                                    1,
+                                    30
+                                  ])
+                            };
                           })
                       ],
                       tl: {
@@ -233,13 +233,13 @@ var suites = {
                           "File \"caml_compare_test.res\", line 22, characters 5-12",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: true,
-                                      _1: Caml_obj.greaterthan([
-                                            1,
-                                            30
-                                          ], undefined)
-                                    };
+                                TAG: "Eq",
+                                _0: true,
+                                _1: Caml_obj.greaterthan([
+                                      1,
+                                      30
+                                    ], undefined)
+                              };
                             })
                         ],
                         tl: {
@@ -247,67 +247,67 @@ var suites = {
                             "File \"caml_compare_test.res\", line 24, characters 6-13",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: Caml_obj.lessthan({
-                                              hd: 2,
+                                  TAG: "Eq",
+                                  _0: true,
+                                  _1: Caml_obj.lessthan({
+                                        hd: 2,
+                                        tl: {
+                                          hd: 6,
+                                          tl: {
+                                            hd: 1,
+                                            tl: {
+                                              hd: 1,
                                               tl: {
-                                                hd: 6,
+                                                hd: 2,
                                                 tl: {
                                                   hd: 1,
                                                   tl: {
-                                                    hd: 1,
+                                                    hd: 4,
                                                     tl: {
                                                       hd: 2,
                                                       tl: {
                                                         hd: 1,
-                                                        tl: {
-                                                          hd: 4,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: /* [] */0
-                                                            }
-                                                          }
-                                                        }
+                                                        tl: /* [] */0
                                                       }
                                                     }
                                                   }
                                                 }
                                               }
-                                            }, {
-                                              hd: 2,
+                                            }
+                                          }
+                                        }
+                                      }, {
+                                        hd: 2,
+                                        tl: {
+                                          hd: 6,
+                                          tl: {
+                                            hd: 1,
+                                            tl: {
+                                              hd: 1,
                                               tl: {
-                                                hd: 6,
+                                                hd: 2,
                                                 tl: {
                                                   hd: 1,
                                                   tl: {
-                                                    hd: 1,
+                                                    hd: 4,
                                                     tl: {
                                                       hd: 2,
                                                       tl: {
                                                         hd: 1,
                                                         tl: {
-                                                          hd: 4,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 409,
-                                                                tl: /* [] */0
-                                                              }
-                                                            }
-                                                          }
+                                                          hd: 409,
+                                                          tl: /* [] */0
                                                         }
                                                       }
                                                     }
                                                   }
                                                 }
                                               }
-                                            })
-                                      };
+                                            }
+                                          }
+                                        }
+                                      })
+                                };
                               })
                           ],
                           tl: {
@@ -315,19 +315,19 @@ var suites = {
                               "File \"caml_compare_test.res\", line 27, characters 5-12",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: true,
-                                          _1: Caml_obj.lessthan({
-                                                hd: 1,
-                                                tl: /* [] */0
-                                              }, {
-                                                hd: 1,
-                                                tl: {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                }
-                                              })
-                                        };
+                                    TAG: "Eq",
+                                    _0: true,
+                                    _1: Caml_obj.lessthan({
+                                          hd: 1,
+                                          tl: /* [] */0
+                                        }, {
+                                          hd: 1,
+                                          tl: {
+                                            hd: 409,
+                                            tl: /* [] */0
+                                          }
+                                        })
+                                  };
                                 })
                             ],
                             tl: {
@@ -335,13 +335,13 @@ var suites = {
                                 "File \"caml_compare_test.res\", line 28, characters 5-12",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: Caml_obj.lessthan(/* [] */0, {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                })
-                                          };
+                                      TAG: "Eq",
+                                      _0: true,
+                                      _1: Caml_obj.lessthan(/* [] */0, {
+                                            hd: 409,
+                                            tl: /* [] */0
+                                          })
+                                    };
                                   })
                               ],
                               tl: {
@@ -349,67 +349,67 @@ var suites = {
                                   "File \"caml_compare_test.res\", line 30, characters 6-13",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: true,
-                                              _1: Caml_obj.greaterthan({
-                                                    hd: 2,
+                                        TAG: "Eq",
+                                        _0: true,
+                                        _1: Caml_obj.greaterthan({
+                                              hd: 2,
+                                              tl: {
+                                                hd: 6,
+                                                tl: {
+                                                  hd: 1,
+                                                  tl: {
+                                                    hd: 1,
                                                     tl: {
-                                                      hd: 6,
+                                                      hd: 2,
                                                       tl: {
                                                         hd: 1,
                                                         tl: {
-                                                          hd: 1,
+                                                          hd: 4,
                                                           tl: {
                                                             hd: 2,
                                                             tl: {
                                                               hd: 1,
                                                               tl: {
-                                                                hd: 4,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: {
-                                                                      hd: 409,
-                                                                      tl: /* [] */0
-                                                                    }
-                                                                  }
-                                                                }
+                                                                hd: 409,
+                                                                tl: /* [] */0
                                                               }
                                                             }
                                                           }
                                                         }
                                                       }
                                                     }
-                                                  }, {
-                                                    hd: 2,
+                                                  }
+                                                }
+                                              }
+                                            }, {
+                                              hd: 2,
+                                              tl: {
+                                                hd: 6,
+                                                tl: {
+                                                  hd: 1,
+                                                  tl: {
+                                                    hd: 1,
                                                     tl: {
-                                                      hd: 6,
+                                                      hd: 2,
                                                       tl: {
                                                         hd: 1,
                                                         tl: {
-                                                          hd: 1,
+                                                          hd: 4,
                                                           tl: {
                                                             hd: 2,
                                                             tl: {
                                                               hd: 1,
-                                                              tl: {
-                                                                hd: 4,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: /* [] */0
-                                                                  }
-                                                                }
-                                                              }
+                                                              tl: /* [] */0
                                                             }
                                                           }
                                                         }
                                                       }
                                                     }
-                                                  })
-                                            };
+                                                  }
+                                                }
+                                              }
+                                            })
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -417,10 +417,10 @@ var suites = {
                                     "File \"caml_compare_test.res\", line 33, characters 5-12",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: false,
-                                                _1: false
-                                              };
+                                          TAG: "Eq",
+                                          _0: false,
+                                          _1: false
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -428,10 +428,10 @@ var suites = {
                                       "File \"caml_compare_test.res\", line 34, characters 5-12",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: false,
-                                                  _1: false
-                                                };
+                                            TAG: "Eq",
+                                            _0: false,
+                                            _1: false
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -439,67 +439,67 @@ var suites = {
                                         "File \"caml_compare_test.res\", line 36, characters 6-13",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: false,
-                                                    _1: Caml_obj.equal({
-                                                          hd: 2,
+                                              TAG: "Eq",
+                                              _0: false,
+                                              _1: Caml_obj.equal({
+                                                    hd: 2,
+                                                    tl: {
+                                                      hd: 6,
+                                                      tl: {
+                                                        hd: 1,
+                                                        tl: {
+                                                          hd: 1,
                                                           tl: {
-                                                            hd: 6,
+                                                            hd: 2,
                                                             tl: {
                                                               hd: 1,
                                                               tl: {
-                                                                hd: 1,
+                                                                hd: 4,
                                                                 tl: {
                                                                   hd: 2,
                                                                   tl: {
                                                                     hd: 1,
-                                                                    tl: {
-                                                                      hd: 4,
-                                                                      tl: {
-                                                                        hd: 2,
-                                                                        tl: {
-                                                                          hd: 1,
-                                                                          tl: /* [] */0
-                                                                        }
-                                                                      }
-                                                                    }
+                                                                    tl: /* [] */0
                                                                   }
                                                                 }
                                                               }
                                                             }
                                                           }
-                                                        }, {
-                                                          hd: 2,
+                                                        }
+                                                      }
+                                                    }
+                                                  }, {
+                                                    hd: 2,
+                                                    tl: {
+                                                      hd: 6,
+                                                      tl: {
+                                                        hd: 1,
+                                                        tl: {
+                                                          hd: 1,
                                                           tl: {
-                                                            hd: 6,
+                                                            hd: 2,
                                                             tl: {
                                                               hd: 1,
                                                               tl: {
-                                                                hd: 1,
+                                                                hd: 4,
                                                                 tl: {
                                                                   hd: 2,
                                                                   tl: {
                                                                     hd: 1,
                                                                     tl: {
-                                                                      hd: 4,
-                                                                      tl: {
-                                                                        hd: 2,
-                                                                        tl: {
-                                                                          hd: 1,
-                                                                          tl: {
-                                                                            hd: 409,
-                                                                            tl: /* [] */0
-                                                                          }
-                                                                        }
-                                                                      }
+                                                                      hd: 409,
+                                                                      tl: /* [] */0
                                                                     }
                                                                   }
                                                                 }
                                                               }
                                                             }
                                                           }
-                                                        })
-                                                  };
+                                                        }
+                                                      }
+                                                    }
+                                                  })
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -507,67 +507,67 @@ var suites = {
                                           "File \"caml_compare_test.res\", line 40, characters 6-13",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: false,
-                                                      _1: Caml_obj.equal({
-                                                            hd: 2,
+                                                TAG: "Eq",
+                                                _0: false,
+                                                _1: Caml_obj.equal({
+                                                      hd: 2,
+                                                      tl: {
+                                                        hd: 6,
+                                                        tl: {
+                                                          hd: 1,
+                                                          tl: {
+                                                            hd: 1,
                                                             tl: {
-                                                              hd: 6,
+                                                              hd: 2,
                                                               tl: {
                                                                 hd: 1,
                                                                 tl: {
-                                                                  hd: 1,
+                                                                  hd: 4,
                                                                   tl: {
                                                                     hd: 2,
                                                                     tl: {
                                                                       hd: 1,
                                                                       tl: {
-                                                                        hd: 4,
-                                                                        tl: {
-                                                                          hd: 2,
-                                                                          tl: {
-                                                                            hd: 1,
-                                                                            tl: {
-                                                                              hd: 409,
-                                                                              tl: /* [] */0
-                                                                            }
-                                                                          }
-                                                                        }
+                                                                        hd: 409,
+                                                                        tl: /* [] */0
                                                                       }
                                                                     }
                                                                   }
                                                                 }
                                                               }
                                                             }
-                                                          }, {
-                                                            hd: 2,
+                                                          }
+                                                        }
+                                                      }
+                                                    }, {
+                                                      hd: 2,
+                                                      tl: {
+                                                        hd: 6,
+                                                        tl: {
+                                                          hd: 1,
+                                                          tl: {
+                                                            hd: 1,
                                                             tl: {
-                                                              hd: 6,
+                                                              hd: 2,
                                                               tl: {
                                                                 hd: 1,
                                                                 tl: {
-                                                                  hd: 1,
+                                                                  hd: 4,
                                                                   tl: {
                                                                     hd: 2,
                                                                     tl: {
                                                                       hd: 1,
-                                                                      tl: {
-                                                                        hd: 4,
-                                                                        tl: {
-                                                                          hd: 2,
-                                                                          tl: {
-                                                                            hd: 1,
-                                                                            tl: /* [] */0
-                                                                          }
-                                                                        }
-                                                                      }
+                                                                      tl: /* [] */0
                                                                     }
                                                                   }
                                                                 }
                                                               }
                                                             }
-                                                          })
-                                                    };
+                                                          }
+                                                        }
+                                                      }
+                                                    })
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -575,16 +575,16 @@ var suites = {
                                             "cmp_id",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: Caml_obj.compare({
-                                                              x: 1,
-                                                              y: 2
-                                                            }, {
-                                                              x: 1,
-                                                              y: 2
-                                                            }),
-                                                        _1: 0
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: Caml_obj.compare({
+                                                        x: 1,
+                                                        y: 2
+                                                      }, {
+                                                        x: 1,
+                                                        y: 2
+                                                      }),
+                                                  _1: 0
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -592,14 +592,14 @@ var suites = {
                                               "cmp_val",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: Caml_obj.compare({
-                                                                x: 1
-                                                              }, {
-                                                                x: 2
-                                                              }),
-                                                          _1: -1
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: Caml_obj.compare({
+                                                          x: 1
+                                                        }, {
+                                                          x: 2
+                                                        }),
+                                                    _1: -1
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -607,14 +607,14 @@ var suites = {
                                                 "cmp_val2",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: Caml_obj.compare({
-                                                                  x: 2
-                                                                }, {
-                                                                  x: 1
-                                                                }),
-                                                            _1: 1
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: Caml_obj.compare({
+                                                            x: 2
+                                                          }, {
+                                                            x: 1
+                                                          }),
+                                                      _1: 1
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -622,10 +622,10 @@ var suites = {
                                                   "cmp_empty",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: Caml_obj.compare({}, {}),
-                                                              _1: 0
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: Caml_obj.compare({}, {}),
+                                                        _1: 0
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -633,10 +633,10 @@ var suites = {
                                                     "cmp_empty2",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: Caml_obj.compare({}, {x:1}),
-                                                                _1: -1
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: Caml_obj.compare({}, {x:1}),
+                                                          _1: -1
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -644,16 +644,16 @@ var suites = {
                                                       "cmp_swap",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: Caml_obj.compare({
-                                                                        x: 1,
-                                                                        y: 2
-                                                                      }, {
-                                                                        y: 2,
-                                                                        x: 1
-                                                                      }),
-                                                                  _1: 0
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: Caml_obj.compare({
+                                                                  x: 1,
+                                                                  y: 2
+                                                                }, {
+                                                                  y: 2,
+                                                                  x: 1
+                                                                }),
+                                                            _1: 0
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -661,10 +661,10 @@ var suites = {
                                                         "cmp_size",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: Caml_obj.compare({x:1}, {x:1, y:2}),
-                                                                    _1: -1
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: Caml_obj.compare({x:1}, {x:1, y:2}),
+                                                              _1: -1
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -672,10 +672,10 @@ var suites = {
                                                           "cmp_size2",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: Caml_obj.compare({x:1, y:2}, {x:1}),
-                                                                      _1: 1
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: Caml_obj.compare({x:1, y:2}, {x:1}),
+                                                                _1: 1
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -683,16 +683,16 @@ var suites = {
                                                             "cmp_order",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: Caml_obj.compare({
-                                                                              x: 0,
-                                                                              y: 1
-                                                                            }, {
-                                                                              x: 1,
-                                                                              y: 0
-                                                                            }),
-                                                                        _1: -1
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: Caml_obj.compare({
+                                                                        x: 0,
+                                                                        y: 1
+                                                                      }, {
+                                                                        x: 1,
+                                                                        y: 0
+                                                                      }),
+                                                                  _1: -1
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -700,16 +700,16 @@ var suites = {
                                                               "cmp_order2",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: Caml_obj.compare({
-                                                                                x: 1,
-                                                                                y: 0
-                                                                              }, {
-                                                                                x: 0,
-                                                                                y: 1
-                                                                              }),
-                                                                          _1: 1
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: Caml_obj.compare({
+                                                                          x: 1,
+                                                                          y: 0
+                                                                        }, {
+                                                                          x: 0,
+                                                                          y: 1
+                                                                        }),
+                                                                    _1: 1
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -717,20 +717,20 @@ var suites = {
                                                                 "cmp_in_list",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: Caml_obj.compare({
-                                                                                  hd: {
-                                                                                    x: 1
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }, {
-                                                                                  hd: {
-                                                                                    x: 2
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }),
-                                                                            _1: -1
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: Caml_obj.compare({
+                                                                            hd: {
+                                                                              x: 1
+                                                                            },
+                                                                            tl: /* [] */0
+                                                                          }, {
+                                                                            hd: {
+                                                                              x: 2
+                                                                            },
+                                                                            tl: /* [] */0
+                                                                          }),
+                                                                      _1: -1
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -738,20 +738,20 @@ var suites = {
                                                                   "cmp_in_list2",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: Caml_obj.compare({
-                                                                                    hd: {
-                                                                                      x: 2
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }, {
-                                                                                    hd: {
-                                                                                      x: 1
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }),
-                                                                              _1: 1
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: Caml_obj.compare({
+                                                                              hd: {
+                                                                                x: 2
+                                                                              },
+                                                                              tl: /* [] */0
+                                                                            }, {
+                                                                              hd: {
+                                                                                x: 1
+                                                                              },
+                                                                              tl: /* [] */0
+                                                                            }),
+                                                                        _1: 1
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -759,20 +759,20 @@ var suites = {
                                                                     "cmp_with_list",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: Caml_obj.compare({
-                                                                                      x: {
-                                                                                        hd: 0,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }, {
-                                                                                      x: {
-                                                                                        hd: 1,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }),
-                                                                                _1: -1
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: Caml_obj.compare({
+                                                                                x: {
+                                                                                  hd: 0,
+                                                                                  tl: /* [] */0
+                                                                                }
+                                                                              }, {
+                                                                                x: {
+                                                                                  hd: 1,
+                                                                                  tl: /* [] */0
+                                                                                }
+                                                                              }),
+                                                                          _1: -1
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -780,20 +780,20 @@ var suites = {
                                                                       "cmp_with_list2",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: Caml_obj.compare({
-                                                                                        x: {
-                                                                                          hd: 1,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }, {
-                                                                                        x: {
-                                                                                          hd: 0,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }),
-                                                                                  _1: 1
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: Caml_obj.compare({
+                                                                                  x: {
+                                                                                    hd: 1,
+                                                                                    tl: /* [] */0
+                                                                                  }
+                                                                                }, {
+                                                                                  x: {
+                                                                                    hd: 0,
+                                                                                    tl: /* [] */0
+                                                                                  }
+                                                                                }),
+                                                                            _1: 1
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -801,15 +801,15 @@ var suites = {
                                                                         "eq_id",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "Ok",
-                                                                                    _0: Caml_obj.equal({
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        }, {
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        })
-                                                                                  };
+                                                                              TAG: "Ok",
+                                                                              _0: Caml_obj.equal({
+                                                                                    x: 1,
+                                                                                    y: 2
+                                                                                  }, {
+                                                                                    x: 1,
+                                                                                    y: 2
+                                                                                  })
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -817,14 +817,14 @@ var suites = {
                                                                           "eq_val",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: Caml_obj.equal({
-                                                                                            x: 1
-                                                                                          }, {
-                                                                                            x: 2
-                                                                                          }),
-                                                                                      _1: false
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: Caml_obj.equal({
+                                                                                      x: 1
+                                                                                    }, {
+                                                                                      x: 2
+                                                                                    }),
+                                                                                _1: false
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -832,14 +832,14 @@ var suites = {
                                                                             "eq_val2",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: Caml_obj.equal({
-                                                                                              x: 2
-                                                                                            }, {
-                                                                                              x: 1
-                                                                                            }),
-                                                                                        _1: false
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: Caml_obj.equal({
+                                                                                        x: 2
+                                                                                      }, {
+                                                                                        x: 1
+                                                                                      }),
+                                                                                  _1: false
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -847,10 +847,10 @@ var suites = {
                                                                               "eq_empty",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: Caml_obj.equal({}, {}),
-                                                                                          _1: true
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: Caml_obj.equal({}, {}),
+                                                                                    _1: true
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -858,10 +858,10 @@ var suites = {
                                                                                 "eq_empty2",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: Caml_obj.equal({}, {x:1}),
-                                                                                            _1: false
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: Caml_obj.equal({}, {x:1}),
+                                                                                      _1: false
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -869,15 +869,15 @@ var suites = {
                                                                                   "eq_swap",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Ok",
-                                                                                              _0: Caml_obj.equal({
-                                                                                                    x: 1,
-                                                                                                    y: 2
-                                                                                                  }, {
-                                                                                                    y: 2,
-                                                                                                    x: 1
-                                                                                                  })
-                                                                                            };
+                                                                                        TAG: "Ok",
+                                                                                        _0: Caml_obj.equal({
+                                                                                              x: 1,
+                                                                                              y: 2
+                                                                                            }, {
+                                                                                              y: 2,
+                                                                                              x: 1
+                                                                                            })
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -885,10 +885,10 @@ var suites = {
                                                                                     "eq_size",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: Caml_obj.equal({x:1}, {x:1, y:2}),
-                                                                                                _1: false
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: Caml_obj.equal({x:1}, {x:1, y:2}),
+                                                                                          _1: false
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -896,10 +896,10 @@ var suites = {
                                                                                       "eq_size2",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: Caml_obj.equal({x:1, y:2}, {x:1}),
-                                                                                                  _1: false
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: Caml_obj.equal({x:1, y:2}, {x:1}),
+                                                                                            _1: false
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -907,20 +907,20 @@ var suites = {
                                                                                         "eq_in_list",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: Caml_obj.equal({
-                                                                                                          hd: {
-                                                                                                            x: 1
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }, {
-                                                                                                          hd: {
-                                                                                                            x: 2
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }),
-                                                                                                    _1: false
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: Caml_obj.equal({
+                                                                                                    hd: {
+                                                                                                      x: 1
+                                                                                                    },
+                                                                                                    tl: /* [] */0
+                                                                                                  }, {
+                                                                                                    hd: {
+                                                                                                      x: 2
+                                                                                                    },
+                                                                                                    tl: /* [] */0
+                                                                                                  }),
+                                                                                              _1: false
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -928,20 +928,20 @@ var suites = {
                                                                                           "eq_in_list2",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: Caml_obj.equal({
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }, {
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }),
-                                                                                                      _1: true
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: Caml_obj.equal({
+                                                                                                      hd: {
+                                                                                                        x: 2
+                                                                                                      },
+                                                                                                      tl: /* [] */0
+                                                                                                    }, {
+                                                                                                      hd: {
+                                                                                                        x: 2
+                                                                                                      },
+                                                                                                      tl: /* [] */0
+                                                                                                    }),
+                                                                                                _1: true
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -949,20 +949,20 @@ var suites = {
                                                                                             "eq_with_list",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: Caml_obj.equal({
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }, {
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }),
-                                                                                                        _1: true
-                                                                                                      };
+                                                                                                  TAG: "Eq",
+                                                                                                  _0: Caml_obj.equal({
+                                                                                                        x: {
+                                                                                                          hd: 0,
+                                                                                                          tl: /* [] */0
+                                                                                                        }
+                                                                                                      }, {
+                                                                                                        x: {
+                                                                                                          hd: 0,
+                                                                                                          tl: /* [] */0
+                                                                                                        }
+                                                                                                      }),
+                                                                                                  _1: true
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -970,20 +970,20 @@ var suites = {
                                                                                               "eq_with_list2",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: Caml_obj.equal({
-                                                                                                                x: {
-                                                                                                                  hd: 0,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }, {
-                                                                                                                x: {
-                                                                                                                  hd: 1,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }),
-                                                                                                          _1: false
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: Caml_obj.equal({
+                                                                                                          x: {
+                                                                                                            hd: 0,
+                                                                                                            tl: /* [] */0
+                                                                                                          }
+                                                                                                        }, {
+                                                                                                          x: {
+                                                                                                            hd: 1,
+                                                                                                            tl: /* [] */0
+                                                                                                          }
+                                                                                                        }),
+                                                                                                    _1: false
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -991,10 +991,10 @@ var suites = {
                                                                                                 "eq_no_prototype",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: Caml_obj.equal({x:1}, ((function(){let o = Object.create(null);o.x = 1;return o;})())),
-                                                                                                            _1: true
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: Caml_obj.equal({x:1}, ((function(){let o = Object.create(null);o.x = 1;return o;})())),
+                                                                                                      _1: true
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -1002,13 +1002,13 @@ var suites = {
                                                                                                   "File \"caml_compare_test.res\", line 76, characters 5-12",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: Caml_obj.compare(null, {
-                                                                                                                    hd: 3,
-                                                                                                                    tl: /* [] */0
-                                                                                                                  }),
-                                                                                                              _1: -1
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: Caml_obj.compare(null, {
+                                                                                                              hd: 3,
+                                                                                                              tl: /* [] */0
+                                                                                                            }),
+                                                                                                        _1: -1
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -1016,13 +1016,13 @@ var suites = {
                                                                                                     "File \"caml_compare_test.res\", line 77, characters 5-12",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: Caml_obj.compare({
-                                                                                                                      hd: 3,
-                                                                                                                      tl: /* [] */0
-                                                                                                                    }, null),
-                                                                                                                _1: 1
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: Caml_obj.compare({
+                                                                                                                hd: 3,
+                                                                                                                tl: /* [] */0
+                                                                                                              }, null),
+                                                                                                          _1: 1
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -1030,10 +1030,10 @@ var suites = {
                                                                                                       "File \"caml_compare_test.res\", line 78, characters 5-12",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: Caml_obj.compare(null, 0),
-                                                                                                                  _1: -1
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: Caml_obj.compare(null, 0),
+                                                                                                            _1: -1
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -1041,10 +1041,10 @@ var suites = {
                                                                                                         "File \"caml_compare_test.res\", line 79, characters 5-12",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: Caml_obj.compare(0, null),
-                                                                                                                    _1: 1
-                                                                                                                  };
+                                                                                                              TAG: "Eq",
+                                                                                                              _0: Caml_obj.compare(0, null),
+                                                                                                              _1: 1
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -1052,10 +1052,10 @@ var suites = {
                                                                                                           "File \"caml_compare_test.res\", line 80, characters 5-12",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: Caml_obj.compare(undefined, 0),
-                                                                                                                      _1: -1
-                                                                                                                    };
+                                                                                                                TAG: "Eq",
+                                                                                                                _0: Caml_obj.compare(undefined, 0),
+                                                                                                                _1: -1
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -1063,10 +1063,10 @@ var suites = {
                                                                                                             "File \"caml_compare_test.res\", line 81, characters 5-12",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: Caml_obj.compare(0, undefined),
-                                                                                                                        _1: 1
-                                                                                                                      };
+                                                                                                                  TAG: "Eq",
+                                                                                                                  _0: Caml_obj.compare(0, undefined),
+                                                                                                                  _1: 1
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: /* [] */0
diff --git a/jscomp/test/caml_format_test.js b/jscomp/test/caml_format_test.js
index a8672ae52f9..1668aef9771 100644
--- a/jscomp/test/caml_format_test.js
+++ b/jscomp/test/caml_format_test.js
@@ -80,25 +80,25 @@ var of_string = [
 
 function from_float_of_string(xs) {
   return $$Array.mapi((function (i, param) {
-                return Pervasives.string_of_float;
-              }), xs);
+          return Pervasives.string_of_float;
+        }), xs);
 }
 
 function from_of_string(xs) {
   return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[1];
-                    var a = param[0];
-                    return [
-                            "of_string " + String(i),
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: Caml_format.int_of_string(b),
-                                        _1: a
-                                      };
-                              })
-                          ];
-                  }), of_string));
+              var b = param[1];
+              var a = param[0];
+              return [
+                "of_string " + String(i),
+                (function (param) {
+                    return {
+                      TAG: "Eq",
+                      _0: Caml_format.int_of_string(b),
+                      _1: a
+                    };
+                  })
+              ];
+            }), of_string));
 }
 
 var to_str = Caml_format.int_of_string;
@@ -146,10 +146,10 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({
             "isnan_of_string",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Pervasives.classify_float(Caml_format.float_of_string("nan")) === "FP_nan"
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: Pervasives.classify_float(Caml_format.float_of_string("nan")) === "FP_nan"
+                };
               })
           ],
           tl: /* [] */0
@@ -157,25 +157,25 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({
                         var b = param[1];
                         var a = param[0];
                         return [
-                                "infinity_of_string " + String(i),
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: Pervasives.classify_float(Caml_format.float_of_string(b))
-                                          };
-                                  })
-                              ];
+                          "infinity_of_string " + String(i),
+                          (function (param) {
+                              return {
+                                TAG: "Eq",
+                                _0: a,
+                                _1: Pervasives.classify_float(Caml_format.float_of_string(b))
+                              };
+                            })
+                        ];
                       }), pairs)), Pervasives.$at({
                   hd: [
                     "throw",
                     (function (param) {
                         return {
-                                TAG: "ThrowAny",
-                                _0: (function (param) {
-                                    Caml_format.float_of_string("");
-                                  })
-                              };
+                          TAG: "ThrowAny",
+                          _0: (function (param) {
+                              Caml_format.float_of_string("");
+                            })
+                        };
                       })
                   ],
                   tl: {
@@ -183,10 +183,10 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({
                       "format_int",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: "                              33",
-                                  _1: Caml_format.format_int("%32d", 33)
-                                };
+                            TAG: "Eq",
+                            _0: "                              33",
+                            _1: Caml_format.format_int("%32d", 33)
+                          };
                         })
                     ],
                     tl: /* [] */0
@@ -195,15 +195,15 @@ var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({
                             var b = param[1];
                             var a = param[0];
                             return [
-                                    "normal_float_of_string " + String(i),
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: a,
-                                                _1: Caml_format.float_of_string(b)
-                                              };
-                                      })
-                                  ];
+                              "normal_float_of_string " + String(i),
+                              (function (param) {
+                                  return {
+                                    TAG: "Eq",
+                                    _0: a,
+                                    _1: Caml_format.float_of_string(b)
+                                  };
+                                })
+                            ];
                           }), pairs$1))))));
 
 function ff(param) {
@@ -322,13 +322,13 @@ var int64_suites_0 = [
   "i64_simple7",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Caml_int64.to_string([
-                    0,
-                    3333
-                  ]),
-              _1: "3333"
-            };
+        TAG: "Eq",
+        _0: Caml_int64.to_string([
+              0,
+              3333
+            ]),
+        _1: "3333"
+      };
     })
 ];
 
@@ -337,10 +337,10 @@ var int64_suites_1 = {
     "i64_simple15",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: Caml_int64.to_string(Caml_int64.neg_one),
-                _1: "-1"
-              };
+          TAG: "Eq",
+          _0: Caml_int64.to_string(Caml_int64.neg_one),
+          _1: "-1"
+        };
       })
   ],
   tl: {
@@ -348,13 +348,13 @@ var int64_suites_1 = {
       "i64_simple16",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: Caml_int64.to_string([
-                        -1,
-                        4294956185
-                      ]),
-                  _1: "-11111"
-                };
+            TAG: "Eq",
+            _0: Caml_int64.to_string([
+                  -1,
+                  4294956185
+                ]),
+            _1: "-11111"
+          };
         })
     ],
     tl: /* [] */0
@@ -428,28 +428,28 @@ Mt.from_pair_suites("Caml_format_test", Pervasives.$at(suites, Pervasives.$at($$
                         var f = param[1];
                         var fmt = param[0];
                         return [
-                                "loat_format " + String(i),
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: Caml_format.format_float(fmt, f),
-                                            _1: str_result
-                                          };
-                                  })
-                              ];
+                          "loat_format " + String(i),
+                          (function (param) {
+                              return {
+                                TAG: "Eq",
+                                _0: Caml_format.format_float(fmt, f),
+                                _1: str_result
+                              };
+                            })
+                        ];
                       }), float_data)), Pervasives.$at(int64_suites, $$Array.to_list($$Array.mapi((function (i, param) {
                             var b = param[1];
                             var a = param[0];
                             return [
-                                    "int64_of_string " + String(i) + " ",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_format.int64_of_string(b),
-                                                _1: a
-                                              };
-                                      })
-                                  ];
+                              "int64_of_string " + String(i) + " ",
+                              (function (param) {
+                                  return {
+                                    TAG: "Eq",
+                                    _0: Caml_format.int64_of_string(b),
+                                    _1: a
+                                  };
+                                })
+                            ];
                           }), of_string_data))))));
 
 var float_suites = {
diff --git a/jscomp/test/chain_code_test.js b/jscomp/test/chain_code_test.js
index 50de370b4bc..6426eff2c5f 100644
--- a/jscomp/test/chain_code_test.js
+++ b/jscomp/test/chain_code_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -53,12 +53,12 @@ function f4(h, x, y) {
 }
 
 eq("File \"chain_code_test.res\", line 24, characters 12-19", 32, ({
-        x: {
-          y: {
-            z: 32
-          }
+      x: {
+        y: {
+          z: 32
         }
-      }).x.y.z);
+      }
+    }).x.y.z);
 
 Mt.from_pair_suites("Chain_code_test", suites.contents);
 
diff --git a/jscomp/test/chn_test.js b/jscomp/test/chn_test.js
index d8d882f1eac..8ba5ca93f98 100644
--- a/jscomp/test/chn_test.js
+++ b/jscomp/test/chn_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -36,20 +36,20 @@ console.log("\x3f\u003f\b\t\n\v\f\r\0\"'");
 
 function convert(s) {
   return $$Array.to_list(Array.from(s, (function (x) {
-                    var x$1 = x.codePointAt(0);
-                    if (x$1 !== undefined) {
-                      return x$1;
-                    }
-                    throw {
-                          RE_EXN_ID: "Assert_failure",
-                          _1: [
-                            "chn_test.res",
-                            17,
-                            14
-                          ],
-                          Error: new Error()
-                        };
-                  })));
+              var x$1 = x.codePointAt(0);
+              if (x$1 !== undefined) {
+                return x$1;
+              }
+              throw {
+                RE_EXN_ID: "Assert_failure",
+                _1: [
+                  "chn_test.res",
+                  17,
+                  14
+                ],
+                Error: new Error()
+              };
+            })));
 }
 
 eq("File \"chn_test.res\", line 24, characters 4-11", "你好，\n世界", "你好，\n世界");
diff --git a/jscomp/test/class_type_ffi_test.js b/jscomp/test/class_type_ffi_test.js
index 98bacc3ec0e..7a8378e774c 100644
--- a/jscomp/test/class_type_ffi_test.js
+++ b/jscomp/test/class_type_ffi_test.js
@@ -17,38 +17,38 @@ function ff2(fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
 
 function off2(o, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
   return Curry.app(o.huge_method, [
-              a0,
-              a1,
-              a2,
-              a3,
-              a4,
-              a5,
-              a6,
-              a7,
-              a8,
-              a9,
-              a10,
-              a11,
-              a12
-            ]);
+        a0,
+        a1,
+        a2,
+        a3,
+        a4,
+        a5,
+        a6,
+        a7,
+        a8,
+        a9,
+        a10,
+        a11,
+        a12
+      ]);
 }
 
 function mk_f(param) {
   return function (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
     return Curry.app(a0, [
-                a1,
-                a2,
-                a3,
-                a4,
-                a5,
-                a6,
-                a7,
-                a8,
-                a9,
-                a10,
-                a11,
-                a12
-              ]);
+          a1,
+          a2,
+          a3,
+          a4,
+          a5,
+          a6,
+          a7,
+          a8,
+          a9,
+          a10,
+          a11,
+          a12
+        ]);
   };
 }
 
diff --git a/jscomp/test/coercion_module_alias_test.js b/jscomp/test/coercion_module_alias_test.js
index 1800a18df1c..e24071e3e28 100644
--- a/jscomp/test/coercion_module_alias_test.js
+++ b/jscomp/test/coercion_module_alias_test.js
@@ -29,8 +29,8 @@ var f = List.length;
 
 function g(x) {
   return List.length(List.map((function (prim) {
-                    return prim + 1 | 0;
-                  }), x));
+              return prim + 1 | 0;
+            }), x));
 }
 
 function F(X) {
@@ -100,9 +100,9 @@ function F0(X) {
     x: 1
   };
   return {
-          N: N,
-          N$p: undefined
-        };
+    N: N,
+    N$p: undefined
+  };
 }
 
 var N$2 = {
@@ -176,8 +176,8 @@ function G0(funarg) {
     x: 1
   };
   return {
-          N$p: N
-        };
+    N$p: N
+  };
 }
 
 var M1 = {
diff --git a/jscomp/test/complex_if_test.js b/jscomp/test/complex_if_test.js
index fe311b7aa3e..9caa9348f2d 100644
--- a/jscomp/test/complex_if_test.js
+++ b/jscomp/test/complex_if_test.js
@@ -126,10 +126,10 @@ var suites_0 = [
   "complete_escape",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Bytes.to_string(escaped(Bytes.of_string("\x00\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"))),
-              _1: "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255"
-            };
+        TAG: "Eq",
+        _0: Bytes.to_string(escaped(Bytes.of_string("\x00\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"))),
+        _1: "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255"
+      };
     })
 ];
 
diff --git a/jscomp/test/complex_test.js b/jscomp/test/complex_test.js
index afe33e828b4..241a7ec0606 100644
--- a/jscomp/test/complex_test.js
+++ b/jscomp/test/complex_test.js
@@ -8,13 +8,13 @@ var suites_0 = [
   "basic_add",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: {
-                re: 2,
-                im: 2
-              },
-              _1: Complex.add(Complex.add(Complex.add(Complex.one, Complex.one), Complex.i), Complex.i)
-            };
+        TAG: "Eq",
+        _0: {
+          re: 2,
+          im: 2
+        },
+        _1: Complex.add(Complex.add(Complex.add(Complex.one, Complex.one), Complex.i), Complex.i)
+      };
     })
 ];
 
diff --git a/jscomp/test/condition_compilation_test.js b/jscomp/test/condition_compilation_test.js
index 3bc735b0aa9..85303505be2 100644
--- a/jscomp/test/condition_compilation_test.js
+++ b/jscomp/test/condition_compilation_test.js
@@ -26,10 +26,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/const_block_test.js b/jscomp/test/const_block_test.js
index 0d6830a09f7..9d745068f71 100644
--- a/jscomp/test/const_block_test.js
+++ b/jscomp/test/const_block_test.js
@@ -37,16 +37,16 @@ function h(param) {
 function g(param) {
   f();
   return {
-          TAG: "Eq",
-          _0: [
-            Caml_array.get(a, 0),
-            Caml_array.get(b, 0)
-          ],
-          _1: [
-            3.0,
-            3
-          ]
-        };
+    TAG: "Eq",
+    _0: [
+      Caml_array.get(a, 0),
+      Caml_array.get(b, 0)
+    ],
+    _1: [
+      3.0,
+      3
+    ]
+  };
 }
 
 var suites_0 = [
@@ -61,17 +61,17 @@ var suites_1 = {
         Caml_array.set(c, 0, 3);
         Caml_array.set(c, 1, 4);
         return {
-                TAG: "Eq",
-                _0: [
-                  3,
-                  4,
-                  2,
-                  3,
-                  4,
-                  5
-                ],
-                _1: c
-              };
+          TAG: "Eq",
+          _0: [
+            3,
+            4,
+            2,
+            3,
+            4,
+            5
+          ],
+          _1: c
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/const_defs_test.js b/jscomp/test/const_defs_test.js
index aab74fb99cd..640d056071f 100644
--- a/jscomp/test/const_defs_test.js
+++ b/jscomp/test/const_defs_test.js
@@ -6,10 +6,10 @@ var u = 3;
 
 function f(param) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "hi",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "hi",
+    Error: new Error()
+  };
 }
 
 exports.u = u;
diff --git a/jscomp/test/cps_test.js b/jscomp/test/cps_test.js
index 96d22f2c4a0..24b2caf6dfd 100644
--- a/jscomp/test/cps_test.js
+++ b/jscomp/test/cps_test.js
@@ -79,10 +79,10 @@ Mt.from_pair_suites("Cps_test", {
         "cps_test_sum",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: 55,
-                    _1: test()
-                  };
+              TAG: "Eq",
+              _0: 55,
+              _1: test()
+            };
           })
       ],
       tl: {
@@ -90,10 +90,10 @@ Mt.from_pair_suites("Cps_test", {
           "cps_test_closure",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 15,
-                      _1: test_closure()
-                    };
+                TAG: "Eq",
+                _0: 15,
+                _1: test_closure()
+              };
             })
         ],
         tl: {
@@ -101,10 +101,10 @@ Mt.from_pair_suites("Cps_test", {
             "cps_test_closure2",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 30,
-                        _1: test_closure2()
-                      };
+                  TAG: "Eq",
+                  _0: 30,
+                  _1: test_closure2()
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/defunctor_make_test.js b/jscomp/test/defunctor_make_test.js
index 2226ddcd861..a72694f115d 100644
--- a/jscomp/test/defunctor_make_test.js
+++ b/jscomp/test/defunctor_make_test.js
@@ -28,13 +28,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -45,10 +45,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l._3;
     var ld = l._2;
@@ -61,27 +61,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r._3;
   var rd = r._2;
@@ -94,22 +94,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, compare, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: data,
+      _3: "Empty",
+      _4: 1
+    };
   }
   var r = x_._3;
   var d = x_._2;
@@ -118,13 +118,13 @@ function add(x, data, compare, x_) {
   var c = compare(x, v);
   if (c === 0) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: x_._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, compare, l), v, d, r);
   } else {
@@ -135,16 +135,16 @@ function add(x, data, compare, x_) {
 function add$1(x, data, v) {
   var X = v.compare;
   return {
-          compare: v.compare,
-          data: add(x, data, X.compare, v.data)
-        };
+    compare: v.compare,
+    data: add(x, data, X.compare, v.data)
+  };
 }
 
 function empty(v) {
   return {
-          compare: v,
-          data: "Empty"
-        };
+    compare: v,
+    data: "Empty"
+  };
 }
 
 var compare = Caml.int_compare;
diff --git a/jscomp/test/demo_int_map.js b/jscomp/test/demo_int_map.js
index 8e4a314c901..b082c9371fa 100644
--- a/jscomp/test/demo_int_map.js
+++ b/jscomp/test/demo_int_map.js
@@ -14,13 +14,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -31,10 +31,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -47,27 +47,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -80,22 +80,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -107,13 +107,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -137,9 +137,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = x - param.v | 0;
     if (c === 0) {
diff --git a/jscomp/test/demo_page.js b/jscomp/test/demo_page.js
index 01135e216cd..c6c41a8732d 100644
--- a/jscomp/test/demo_page.js
+++ b/jscomp/test/demo_page.js
@@ -26,10 +26,10 @@ function map(f, x) {
     return "Nil";
   } else {
     return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
+      TAG: "Cons",
+      _0: Curry._1(f, x._0),
+      _1: map(f, x._1)
+    };
   }
 }
 
@@ -44,8 +44,8 @@ function f(param) {
 ReactDom.render(React.createClass({
           render: (function (param) {
               return React.DOM.div({
-                          alt: "pic"
-                        }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"));
+                    alt: "pic"
+                  }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"));
             })
         }), document.getElementById("hi"));
 
diff --git a/jscomp/test/demo_pipe.js b/jscomp/test/demo_pipe.js
index d9544646584..17e2e570be8 100644
--- a/jscomp/test/demo_pipe.js
+++ b/jscomp/test/demo_pipe.js
@@ -4,10 +4,10 @@
 
 function register(rl) {
   return rl.on("line", (function (x) {
-                  console.log(x);
-                })).on("close", (function (param) {
-                console.log("finished");
-              }));
+            console.log(x);
+          })).on("close", (function (param) {
+          console.log("finished");
+        }));
 }
 
 exports.register = register;
diff --git a/jscomp/test/derive_projector_test.js b/jscomp/test/derive_projector_test.js
index f68a46d0d95..ba7461db9e6 100644
--- a/jscomp/test/derive_projector_test.js
+++ b/jscomp/test/derive_projector_test.js
@@ -16,31 +16,31 @@ function c_x(param) {
 
 function d_int(param_0) {
   return {
-          TAG: "D_int",
-          _0: param_0
-        };
+    TAG: "D_int",
+    _0: param_0
+  };
 }
 
 function d_tuple(param_0, param_1) {
   return {
-          TAG: "D_tuple",
-          _0: param_0,
-          _1: param_1
-        };
+    TAG: "D_tuple",
+    _0: param_0,
+    _1: param_1
+  };
 }
 
 function newContent(param_0) {
   return {
-          TAG: "NewContent",
-          _0: param_0
-        };
+    TAG: "NewContent",
+    _0: param_0
+  };
 }
 
 function d_tweak(param_0) {
   return {
-          TAG: "D_tweak",
-          _0: param_0
-        };
+    TAG: "D_tweak",
+    _0: param_0
+  };
 }
 
 function u_X(param) {
@@ -93,16 +93,16 @@ var h = {
 
 function xx(param_0) {
   return {
-          TAG: "Xx",
-          _0: param_0
-        };
+    TAG: "Xx",
+    _0: param_0
+  };
 }
 
 function a(param_0) {
   return {
-          TAG: "A",
-          _0: param_0
-        };
+    TAG: "A",
+    _0: param_0
+  };
 }
 
 var d_empty = "D_empty";
diff --git a/jscomp/test/digest_test.js b/jscomp/test/digest_test.js
index fe38db27769..58ba5c30ba0 100644
--- a/jscomp/test/digest_test.js
+++ b/jscomp/test/digest_test.js
@@ -150,10 +150,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
             "File \"digest_test.res\", line 9, characters 9-16",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: Digest.to_hex(Digest.string("value")),
-                        _1: "2063c1608d6e0baf80249c42e2be5804"
-                      };
+                  TAG: "Eq",
+                  _0: Digest.to_hex(Digest.string("value")),
+                  _1: "2063c1608d6e0baf80249c42e2be5804"
+                };
               })
           ],
           tl: {
@@ -161,10 +161,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
               "File \"digest_test.res\", line 11, characters 10-17",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog")),
-                          _1: "9e107d9d372bb6826bd81d3542a419d6"
-                        };
+                    TAG: "Eq",
+                    _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog")),
+                    _1: "9e107d9d372bb6826bd81d3542a419d6"
+                  };
                 })
             ],
             tl: {
@@ -172,10 +172,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
                 "File \"digest_test.res\", line 18, characters 10-17",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.")),
-                            _1: "e4d909c290d0fb1ca068ffaddf22cbd0"
-                          };
+                      TAG: "Eq",
+                      _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.")),
+                      _1: "e4d909c290d0fb1ca068ffaddf22cbd0"
+                    };
                   })
               ],
               tl: {
@@ -183,10 +183,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
                   "File \"digest_test.res\", line 24, characters 9-16",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: Digest.to_hex(Digest.string("")),
-                              _1: "d41d8cd98f00b204e9800998ecf8427e"
-                            };
+                        TAG: "Eq",
+                        _0: Digest.to_hex(Digest.string("")),
+                        _1: "d41d8cd98f00b204e9800998ecf8427e"
+                      };
                     })
                 ],
                 tl: {
@@ -194,10 +194,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
                     "File \"digest_test.res\", line 26, characters 10-17",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
-                                _1: "7065cc36bba1d155fb09f9d02f22e8bf"
-                              };
+                          TAG: "Eq",
+                          _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
+                          _1: "7065cc36bba1d155fb09f9d02f22e8bf"
+                        };
                       })
                   ],
                   tl: {
@@ -205,10 +205,10 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
                       "File \"digest_test.res\", line 45, characters 10-17",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
-                                  _1: "b9193d1df4b7a8f0a25ffdd1005c5b2b"
-                                };
+                            TAG: "Eq",
+                            _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
+                            _1: "b9193d1df4b7a8f0a25ffdd1005c5b2b"
+                          };
                         })
                     ],
                     tl: /* [] */0
@@ -219,15 +219,15 @@ Mt.from_pair_suites("Digest_test", Pervasives.$at({
           }
         }, $$Array.to_list($$Array.map((function (i) {
                     return [
-                            String(i),
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: Digest.to_hex(Digest.string("a".repeat(i))),
-                                        _1: Caml_array.get(ref, i)
-                                      };
-                              })
-                          ];
+                      String(i),
+                      (function (param) {
+                          return {
+                            TAG: "Eq",
+                            _0: Digest.to_hex(Digest.string("a".repeat(i))),
+                            _1: Caml_array.get(ref, i)
+                          };
+                        })
+                    ];
                   }), Ext_array_test.range(0, 129)))));
 
 exports.f = f;
diff --git a/jscomp/test/div_by_zero_test.js b/jscomp/test/div_by_zero_test.js
index 1143ba4c35d..2db6b2d051f 100644
--- a/jscomp/test/div_by_zero_test.js
+++ b/jscomp/test/div_by_zero_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -41,11 +41,11 @@ add([
       "File \"div_by_zero_test.res\", line 11, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int32.div(3, 0);
+              })
+          };
         })
     ]);
 
@@ -53,11 +53,11 @@ add([
       "File \"div_by_zero_test.res\", line 12, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int32.mod_(3, 0);
+              })
+          };
         })
     ]);
 
@@ -65,11 +65,11 @@ add([
       "File \"div_by_zero_test.res\", line 13, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int32.div(3, 0);
+              })
+          };
         })
     ]);
 
@@ -77,11 +77,11 @@ add([
       "File \"div_by_zero_test.res\", line 14, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int32.mod_(3, 0);
+              })
+          };
         })
     ]);
 
@@ -89,14 +89,14 @@ add([
       "File \"div_by_zero_test.res\", line 15, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int64.div([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int64.div([
+                      0,
+                      3
+                    ], Caml_int64.zero);
+              })
+          };
         })
     ]);
 
@@ -104,14 +104,14 @@ add([
       "File \"div_by_zero_test.res\", line 16, characters 7-14",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int64.mod_([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Caml_int64.mod_([
+                      0,
+                      3
+                    ], Caml_int64.zero);
+              })
+          };
         })
     ]);
 
diff --git a/jscomp/test/dollar_escape_test.js b/jscomp/test/dollar_escape_test.js
index 963db6708fe..33b1efe317d 100644
--- a/jscomp/test/dollar_escape_test.js
+++ b/jscomp/test/dollar_escape_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/earger_curry_test.js b/jscomp/test/earger_curry_test.js
index 123a360b941..669055d1b0e 100644
--- a/jscomp/test/earger_curry_test.js
+++ b/jscomp/test/earger_curry_test.js
@@ -26,10 +26,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, f$1(0));
   for(var i = 1; i < l; ++i){
@@ -77,10 +77,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/epsilon_test.js b/jscomp/test/epsilon_test.js
index e64f49f0e5a..9ac06227c76 100644
--- a/jscomp/test/epsilon_test.js
+++ b/jscomp/test/epsilon_test.js
@@ -10,10 +10,10 @@ var suites_0 = [
   "epsilon",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Pervasives.epsilon_float,
-              _1: v
-            };
+        TAG: "Eq",
+        _0: Pervasives.epsilon_float,
+        _1: v
+      };
     })
 ];
 
@@ -22,10 +22,10 @@ var suites_1 = {
     "raw_epsilon",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 2.220446049250313e-16,
-                _1: v
-              };
+          TAG: "Eq",
+          _0: 2.220446049250313e-16,
+          _1: v
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/equal_exception_test.js b/jscomp/test/equal_exception_test.js
index 5c6e0b55071..0d92159eb5e 100644
--- a/jscomp/test/equal_exception_test.js
+++ b/jscomp/test/equal_exception_test.js
@@ -14,59 +14,59 @@ var v = "gso";
 function is_equal(param) {
   if (Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0) !== /* 'a' */97) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            4,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "equal_exception_test.res",
+        4,
+        2
+      ],
+      Error: new Error()
+    };
   }
   if (Bytes.make(3, /* 'a' */97)[0] !== /* 'a' */97) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            5,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "equal_exception_test.res",
+        5,
+        2
+      ],
+      Error: new Error()
+    };
   }
   var u = Bytes.make(3, /* 'a' */97);
   u[0] = /* 'b' */98;
   if (u[0] !== /* 'b' */98) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            8,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "equal_exception_test.res",
+        8,
+        2
+      ],
+      Error: new Error()
+    };
   }
   if (Caml_string.get(v, 0) === /* 'g' */103) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          9,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "equal_exception_test.res",
+      9,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function is_exception(param) {
   try {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   catch (raw_exn){
     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -102,9 +102,9 @@ function is_arbitrary_exception(param) {
   var A = /* @__PURE__ */Caml_exceptions.create("A");
   try {
     throw {
-          RE_EXN_ID: A,
-          Error: new Error()
-        };
+      RE_EXN_ID: A,
+      Error: new Error()
+    };
   }
   catch (exn){
     return;
@@ -155,26 +155,26 @@ if (Caml_obj.equal(e, {
         RE_EXN_ID: Not_found
       }) !== false) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          50,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "equal_exception_test.res",
+      50,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (Not_found === "Not_found" !== false) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          51,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "equal_exception_test.res",
+      51,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 Mt.from_suites("exception", suites);
diff --git a/jscomp/test/es6_module_test.js b/jscomp/test/es6_module_test.js
index 6bee56afcba..22c2803c3af 100644
--- a/jscomp/test/es6_module_test.js
+++ b/jscomp/test/es6_module_test.js
@@ -13,16 +13,16 @@ Mt.from_pair_suites("Es6_module_test", {
         "list_length",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: List.length({
-                          hd: 1,
-                          tl: {
-                            hd: 2,
-                            tl: /* [] */0
-                          }
-                        }),
-                    _1: 2
-                  };
+              TAG: "Eq",
+              _0: List.length({
+                    hd: 1,
+                    tl: {
+                      hd: 2,
+                      tl: /* [] */0
+                    }
+                  }),
+              _1: 2
+            };
           })
       ],
       tl: {
@@ -30,10 +30,10 @@ Mt.from_pair_suites("Es6_module_test", {
           "length",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: 3
-                    };
+                TAG: "Eq",
+                _0: 3,
+                _1: 3
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/exception_raise_test.js b/jscomp/test/exception_raise_test.js
index 6ea49475deb..292bbb351e4 100644
--- a/jscomp/test/exception_raise_test.js
+++ b/jscomp/test/exception_raise_test.js
@@ -101,14 +101,14 @@ catch (raw_x$3){
     a0 = x$3._1;
   } else {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "exception_raise_test.res",
-            104,
-            7
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "exception_raise_test.res",
+        104,
+        7
+      ],
+      Error: new Error()
+    };
   }
 }
 
@@ -136,20 +136,20 @@ var suites = {
       "File \"exception_raise_test.res\", line 120, characters 5-12",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: [
-                    f,
-                    ff,
-                    fff,
-                    a0
-                  ],
-                  _1: [
-                    2,
-                    2,
-                    2,
-                    2
-                  ]
-                };
+            TAG: "Eq",
+            _0: [
+              f,
+              ff,
+              fff,
+              a0
+            ],
+            _1: [
+              2,
+              2,
+              2,
+              2
+            ]
+          };
         })
     ],
     tl: {
@@ -158,20 +158,20 @@ var suites = {
         (function (param) {
             if (a1.RE_EXN_ID === Js_exn.$$Error) {
               return {
-                      TAG: "Eq",
-                      _0: a1._1,
-                      _1: 2
-                    };
+                TAG: "Eq",
+                _0: a1._1,
+                _1: 2
+              };
             }
             throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "exception_raise_test.res",
-                    127,
-                    15
-                  ],
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Assert_failure",
+              _1: [
+                "exception_raise_test.res",
+                127,
+                15
+              ],
+              Error: new Error()
+            };
           })
       ],
       tl: /* [] */0
@@ -197,9 +197,9 @@ catch (raw_e$2){
 
 try {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 catch (raw_e$3){
   var e$1 = Caml_js_exceptions.internalToOCamlException(raw_e$3);
diff --git a/jscomp/test/exception_rebound_err_test.js b/jscomp/test/exception_rebound_err_test.js
index 40ffd42b901..17b37ccdd5a 100644
--- a/jscomp/test/exception_rebound_err_test.js
+++ b/jscomp/test/exception_rebound_err_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/exception_value_test.js b/jscomp/test/exception_value_test.js
index c9f802bfe38..b58704a480a 100644
--- a/jscomp/test/exception_value_test.js
+++ b/jscomp/test/exception_value_test.js
@@ -8,31 +8,31 @@ var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
 function f(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function assert_f(x) {
   if (x <= 3) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "exception_value_test.res",
-            4,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "exception_value_test.res",
+        4,
+        11
+      ],
+      Error: new Error()
+    };
   }
   return 3;
 }
 
 function hh(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var A = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.A");
diff --git a/jscomp/test/ext_array_test.js b/jscomp/test/ext_array_test.js
index b0d750cc455..9f29e9b5cdc 100644
--- a/jscomp/test/ext_array_test.js
+++ b/jscomp/test/ext_array_test.js
@@ -107,28 +107,28 @@ function filter_map(f, a) {
 function range(from, to_) {
   if (from > to_) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_array_test.range",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_array_test.range",
+      Error: new Error()
+    };
   }
   return $$Array.init((to_ - from | 0) + 1 | 0, (function (i) {
-                return i + from | 0;
-              }));
+          return i + from | 0;
+        }));
 }
 
 function map2i(f, a, b) {
   var len = a.length;
   if (len !== b.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_array_test.map2i",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_array_test.map2i",
+      Error: new Error()
+    };
   }
   return $$Array.mapi((function (i, a) {
-                return Curry._3(f, i, a, b[i]);
-              }), a);
+          return Curry._3(f, i, a, b[i]);
+        }), a);
 }
 
 function tolist_aux(a, f, _i, _res) {
@@ -141,9 +141,9 @@ function tolist_aux(a, f, _i, _res) {
     var v = a[i];
     var v$1 = Curry._1(f, v);
     _res = v$1 !== undefined ? ({
-          hd: Caml_option.valFromOption(v$1),
-          tl: res
-        }) : res;
+        hd: Caml_option.valFromOption(v$1),
+        tl: res
+      }) : res;
     _i = i - 1 | 0;
     continue ;
   };
@@ -202,12 +202,12 @@ function rfind_and_split(arr, cmp, v) {
     return "No_split";
   } else {
     return {
-            NAME: "Split",
-            VAL: [
-              $$Array.sub(arr, 0, i),
-              $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
+      NAME: "Split",
+      VAL: [
+        $$Array.sub(arr, 0, i),
+        $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
+      ]
+    };
   }
 }
 
@@ -233,12 +233,12 @@ function find_and_split(arr, cmp, v) {
     return "No_split";
   } else {
     return {
-            NAME: "Split",
-            VAL: [
-              $$Array.sub(arr, 0, i),
-              $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
+      NAME: "Split",
+      VAL: [
+        $$Array.sub(arr, 0, i),
+        $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
+      ]
+    };
   }
 }
 
diff --git a/jscomp/test/ext_bytes_test.js b/jscomp/test/ext_bytes_test.js
index 7dbe56621c5..b8cf7033045 100644
--- a/jscomp/test/ext_bytes_test.js
+++ b/jscomp/test/ext_bytes_test.js
@@ -138,9 +138,9 @@ function starts_with(xs, prefix, p) {
     for(var i = 0; i < len2; ++i){
       if (!Curry._2(p, Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) {
         throw {
-              RE_EXN_ID: H,
-              Error: new Error()
-            };
+          RE_EXN_ID: H,
+          Error: new Error()
+        };
       }
       
     }
@@ -191,22 +191,22 @@ eq("File \"ext_bytes_test.res\", line 153, characters 5-12", s, s2);
 
 function f$1(a, b) {
   return [
-          Caml_bytes.bytes_greaterthan(a, b),
-          Caml_bytes.bytes_greaterequal(a, b),
-          Caml_bytes.bytes_lessthan(a, b),
-          Caml_bytes.bytes_lessequal(a, b),
-          Caml_bytes.bytes_equal(a, b)
-        ];
+    Caml_bytes.bytes_greaterthan(a, b),
+    Caml_bytes.bytes_greaterequal(a, b),
+    Caml_bytes.bytes_lessthan(a, b),
+    Caml_bytes.bytes_lessequal(a, b),
+    Caml_bytes.bytes_equal(a, b)
+  ];
 }
 
 function f_0(a, b) {
   return [
-          Caml.i64_gt(a, b),
-          Caml.i64_ge(a, b),
-          Caml.i64_lt(a, b),
-          Caml.i64_le(a, b),
-          Caml.i64_eq(a, b)
-        ];
+    Caml.i64_gt(a, b),
+    Caml.i64_ge(a, b),
+    Caml.i64_lt(a, b),
+    Caml.i64_le(a, b),
+    Caml.i64_eq(a, b)
+  ];
 }
 
 Mt.from_pair_suites("Ext_bytes_test", suites.contents);
diff --git a/jscomp/test/ext_filename_test.js b/jscomp/test/ext_filename_test.js
index 39ccaaa4b26..42a2f700c2e 100644
--- a/jscomp/test/ext_filename_test.js
+++ b/jscomp/test/ext_filename_test.js
@@ -66,10 +66,10 @@ function chop_extension(locOpt, name) {
     if (exn.RE_EXN_ID === "Invalid_argument") {
       var s = "Filename.chop_extension ( " + loc + " : " + name + " )";
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: s,
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: s,
+        Error: new Error()
+      };
     }
     throw exn;
   }
@@ -105,8 +105,8 @@ function relative_path(file_or_dir_1, file_or_dir_2) {
         continue ;
       }
       return Pervasives.$at(List.map((function (param) {
-                        return node_parent;
-                      }), dir2), dir1);
+                  return node_parent;
+                }), dir2), dir1);
     };
   };
   var ys = go(dir1, dir2);
@@ -133,18 +133,18 @@ function node_relative_path(node_modules_shorten, file1, dep_file) {
   var len = file2.length;
   if (!(node_modules_shorten && v >= 0)) {
     return relative_path(dep_file.NAME === "File" ? ({
-                    NAME: "File",
-                    VAL: absolute_path(dep_file.VAL)
-                  }) : ({
-                    NAME: "Dir",
-                    VAL: absolute_path(dep_file.VAL)
-                  }), file1.NAME === "File" ? ({
-                    NAME: "File",
-                    VAL: absolute_path(file1.VAL)
-                  }) : ({
-                    NAME: "Dir",
-                    VAL: absolute_path(file1.VAL)
-                  })) + (node_sep + Curry._1(Filename.basename, file2));
+            NAME: "File",
+            VAL: absolute_path(dep_file.VAL)
+          }) : ({
+            NAME: "Dir",
+            VAL: absolute_path(dep_file.VAL)
+          }), file1.NAME === "File" ? ({
+            NAME: "File",
+            VAL: absolute_path(file1.VAL)
+          }) : ({
+            NAME: "Dir",
+            VAL: absolute_path(file1.VAL)
+          })) + (node_sep + Curry._1(Filename.basename, file2));
   }
   var skip = function (_i) {
     while(true) {
@@ -152,10 +152,10 @@ function node_relative_path(node_modules_shorten, file1, dep_file) {
       if (i >= len) {
         var s = "invalid path: " + file2;
         throw {
-              RE_EXN_ID: "Failure",
-              _1: s,
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: s,
+          Error: new Error()
+        };
       }
       var curr_char = file2.codePointAt(i);
       if (!(curr_char === os_path_separator_char || curr_char === /* '.' */46)) {
@@ -181,10 +181,10 @@ function find_root_filename(_cwd, filename) {
     }
     var s = filename + " not found from " + cwd;
     throw {
-          RE_EXN_ID: "Failure",
-          _1: s,
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: s,
+      Error: new Error()
+    };
   };
 }
 
@@ -228,9 +228,9 @@ function split_aux(p) {
     var dir = Curry._1(Filename.dirname, p$1);
     if (dir === p$1) {
       return [
-              dir,
-              acc
-            ];
+        dir,
+        acc
+      ];
     }
     var new_path = Curry._1(Filename.basename, p$1);
     if (new_path === Filename.dir_sep) {
@@ -268,8 +268,8 @@ function rel_normalized_absolute_path(from, to_) {
     var xs = xss.tl;
     if (!yss) {
       return List.fold_left((function (acc, param) {
-                    return Filename.concat(acc, Ext_string_test.parent_dir_lit);
-                  }), Ext_string_test.parent_dir_lit, xs);
+              return Filename.concat(acc, Ext_string_test.parent_dir_lit);
+            }), Ext_string_test.parent_dir_lit, xs);
     }
     if (xss.hd === yss.hd) {
       _yss = yss.tl;
@@ -358,10 +358,10 @@ if (Sys.unix) {
 } else {
   var s = "Unknown OS : " + Sys.os_type;
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var $slash$slash = Filename.concat;
diff --git a/jscomp/test/ext_list_test.js b/jscomp/test/ext_list_test.js
index b7635b48458..52f77f37e7a 100644
--- a/jscomp/test/ext_list_test.js
+++ b/jscomp/test/ext_list_test.js
@@ -17,9 +17,9 @@ function filter_map(f, _xs) {
     var z = Curry._1(f, xs.hd);
     if (z !== undefined) {
       return {
-              hd: Caml_option.valFromOption(z),
-              tl: filter_map(f, ys)
-            };
+        hd: Caml_option.valFromOption(z),
+        tl: filter_map(f, ys)
+      };
     }
     _xs = ys;
     continue ;
@@ -55,14 +55,14 @@ function excludes(p, l) {
   var v = aux(/* [] */0, l);
   if (excluded.contents) {
     return [
-            true,
-            v
-          ];
+      true,
+      v
+    ];
   } else {
     return [
-            false,
-            l
-          ];
+      false,
+      l
+    ];
   }
 }
 
@@ -94,9 +94,9 @@ function exclude_with_fact(p, l) {
   };
   var v = aux(/* [] */0, l);
   return [
-          excluded.contents,
-          excluded.contents !== undefined ? v : l
-        ];
+    excluded.contents,
+    excluded.contents !== undefined ? v : l
+  ];
 }
 
 function exclude_with_fact2(p1, p2, l) {
@@ -135,10 +135,10 @@ function exclude_with_fact2(p1, p2, l) {
   };
   var v = aux(/* [] */0, l);
   return [
-          excluded1.contents,
-          excluded2.contents,
-          excluded1.contents !== undefined && excluded2.contents !== undefined ? v : l
-        ];
+    excluded1.contents,
+    excluded2.contents,
+    excluded1.contents !== undefined && excluded2.contents !== undefined ? v : l
+  ];
 }
 
 function same_length(_xs, _ys) {
@@ -173,9 +173,9 @@ function filter_mapi(f, xs) {
       var z = Curry._2(f, i, xs.hd);
       if (z !== undefined) {
         return {
-                hd: Caml_option.valFromOption(z),
-                tl: aux(i + 1 | 0, ys)
-              };
+          hd: Caml_option.valFromOption(z),
+          tl: aux(i + 1 | 0, ys)
+        };
       }
       _xs = ys;
       _i = i + 1 | 0;
@@ -196,28 +196,28 @@ function filter_map2(f, _xs, _ys) {
         var z = Curry._2(f, xs.hd, ys.hd);
         if (z !== undefined) {
           return {
-                  hd: Caml_option.valFromOption(z),
-                  tl: filter_map2(f, us, vs)
-                };
+            hd: Caml_option.valFromOption(z),
+            tl: filter_map2(f, us, vs)
+          };
         }
         _ys = vs;
         _xs = us;
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.filter_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.filter_map2",
+        Error: new Error()
+      };
     }
     if (!ys) {
       return /* [] */0;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.filter_map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_list_test.filter_map2",
+      Error: new Error()
+    };
   };
 }
 
@@ -234,9 +234,9 @@ function filter_map2i(f, xs, ys) {
           var z = Curry._3(f, i, xs.hd, ys.hd);
           if (z !== undefined) {
             return {
-                    hd: Caml_option.valFromOption(z),
-                    tl: aux(i + 1 | 0, us, vs)
-                  };
+              hd: Caml_option.valFromOption(z),
+              tl: aux(i + 1 | 0, us, vs)
+            };
           }
           _ys = vs;
           _xs = us;
@@ -244,19 +244,19 @@ function filter_map2i(f, xs, ys) {
           continue ;
         }
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.filter_map2i",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Ext_list_test.filter_map2i",
+          Error: new Error()
+        };
       }
       if (!ys) {
         return /* [] */0;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.filter_map2i",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.filter_map2i",
+        Error: new Error()
+      };
     };
   };
   return aux(0, xs, ys);
@@ -294,17 +294,17 @@ function flat_map2(f, lx, ly) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.flat_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.flat_map2",
+        Error: new Error()
+      };
     }
     if (ly$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.flat_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.flat_map2",
+        Error: new Error()
+      };
     }
     return List.rev(acc);
   };
@@ -339,40 +339,40 @@ function map2_last(f, l1, l2) {
       if (l2) {
         if (!l2.tl) {
           return {
-                  hd: Curry._3(f, true, u, l2.hd),
-                  tl: /* [] */0
-                };
+            hd: Curry._3(f, true, u, l2.hd),
+            tl: /* [] */0
+          };
         }
         
       } else {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "List.map2_last",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "List.map2_last",
+          Error: new Error()
+        };
       }
     }
     if (l2) {
       var r = Curry._3(f, false, u, l2.hd);
       return {
-              hd: r,
-              tl: map2_last(f, l1$1, l2.tl)
-            };
+        hd: r,
+        tl: map2_last(f, l1$1, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2_last",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2_last",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2_last",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2_last",
+    Error: new Error()
+  };
 }
 
 function map_last(f, l1) {
@@ -383,15 +383,15 @@ function map_last(f, l1) {
   var u = l1.hd;
   if (!l1$1) {
     return {
-            hd: Curry._2(f, true, u),
-            tl: /* [] */0
-          };
+      hd: Curry._2(f, true, u),
+      tl: /* [] */0
+    };
   }
   var r = Curry._2(f, false, u);
   return {
-          hd: r,
-          tl: map_last(f, l1$1)
-        };
+    hd: r,
+    tl: map_last(f, l1$1)
+  };
 }
 
 function fold_right2_last(f, l1, l2, accu) {
@@ -406,27 +406,27 @@ function fold_right2_last(f, l1, l2, accu) {
         
       } else {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "List.fold_right2",
+          Error: new Error()
+        };
       }
     }
     if (l2) {
       return Curry._4(f, false, last1, l2.hd, fold_right2_last(f, l1$1, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -440,15 +440,15 @@ function take(n, l) {
   var arr_length = arr.length;
   if (arr_length < n) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.take",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_list_test.take",
+      Error: new Error()
+    };
   }
   return [
-          $$Array.to_list($$Array.sub(arr, 0, n)),
-          $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
-        ];
+    $$Array.to_list($$Array.sub(arr, 0, n)),
+    $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
+  ];
 }
 
 function try_take(n, l) {
@@ -456,16 +456,16 @@ function try_take(n, l) {
   var arr_length = arr.length;
   if (arr_length <= n) {
     return [
-            l,
-            arr_length,
-            /* [] */0
-          ];
+      l,
+      arr_length,
+      /* [] */0
+    ];
   } else {
     return [
-            $$Array.to_list($$Array.sub(arr, 0, n)),
-            n,
-            $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
-          ];
+      $$Array.to_list($$Array.sub(arr, 0, n)),
+      n,
+      $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
+    ];
   }
 }
 
@@ -516,9 +516,9 @@ function exclude_tail(x) {
       var x$2 = x$1.hd;
       if (!ys) {
         return [
-                x$2,
-                List.rev(acc)
-              ];
+          x$2,
+          List.rev(acc)
+        ];
       }
       _x = ys;
       _acc = {
@@ -528,10 +528,10 @@ function exclude_tail(x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.exclude_tail",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_list_test.exclude_tail",
+      Error: new Error()
+    };
   };
 }
 
@@ -546,28 +546,28 @@ function group(cmp, lst) {
 function aux(cmp, x, xss) {
   if (!xss) {
     return {
-            hd: {
-              hd: x,
-              tl: /* [] */0
-            },
-            tl: /* [] */0
-          };
+      hd: {
+        hd: x,
+        tl: /* [] */0
+      },
+      tl: /* [] */0
+    };
   }
   var ys = xss.tl;
   var y = xss.hd;
   if (Curry._2(cmp, x, List.hd(y))) {
     return {
-            hd: {
-              hd: x,
-              tl: y
-            },
-            tl: ys
-          };
+      hd: {
+        hd: x,
+        tl: y
+      },
+      tl: ys
+    };
   } else {
     return {
-            hd: y,
-            tl: aux(cmp, x, ys)
-          };
+      hd: y,
+      tl: aux(cmp, x, ys)
+    };
   }
 }
 
@@ -581,20 +581,20 @@ function drop(_n, _h) {
     var n = _n;
     if (n < 0) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.drop",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.drop",
+        Error: new Error()
+      };
     }
     if (n === 0) {
       return h;
     }
     if (h === /* [] */0) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.drop",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Ext_list_test.drop",
+        Error: new Error()
+      };
     }
     _h = List.tl(h);
     _n = n - 1 | 0;
@@ -634,8 +634,8 @@ function for_all_opt(p, _x) {
 
 function fold(f, l, init) {
   return List.fold_left((function (acc, i) {
-                return Curry._2(f, i, init);
-              }), init, l);
+          return Curry._2(f, i, init);
+        }), init, l);
 }
 
 function rev_map_acc(acc, f, l) {
@@ -659,9 +659,9 @@ function rev_map_acc(acc, f, l) {
 function map_acc(acc, f, l) {
   if (l) {
     return {
-            hd: Curry._1(f, l.hd),
-            tl: map_acc(acc, f, l.tl)
-          };
+      hd: Curry._1(f, l.hd),
+      tl: map_acc(acc, f, l.tl)
+    };
   } else {
     return acc;
   }
@@ -738,9 +738,9 @@ function split_map(f, xs) {
     var bs = _bs;
     if (!xs$1) {
       return [
-              List.rev(bs),
-              List.rev(cs)
-            ];
+        List.rev(bs),
+        List.rev(cs)
+      ];
     }
     var match = Curry._1(f, xs$1.hd);
     _xs = xs$1.tl;
@@ -760,14 +760,14 @@ function reduce_from_right(fn, lst) {
   var match = List.rev(lst);
   if (match) {
     return List.fold_left((function (x, y) {
-                  return Curry._2(fn, y, x);
-                }), match.hd, match.tl);
+            return Curry._2(fn, y, x);
+          }), match.hd, match.tl);
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.reduce",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Ext_list_test.reduce",
+    Error: new Error()
+  };
 }
 
 function reduce_from_left(fn, lst) {
@@ -775,16 +775,16 @@ function reduce_from_left(fn, lst) {
     return List.fold_left(fn, lst.hd, lst.tl);
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.reduce_from_left",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Ext_list_test.reduce_from_left",
+    Error: new Error()
+  };
 }
 
 function create_ref_empty(param) {
   return {
-          contents: /* [] */0
-        };
+    contents: /* [] */0
+  };
 }
 
 function ref_top(x) {
@@ -793,10 +793,10 @@ function ref_top(x) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.ref_top",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Ext_list_test.ref_top",
+    Error: new Error()
+  };
 }
 
 function ref_empty(x) {
@@ -822,10 +822,10 @@ function ref_pop(refs) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.ref_pop",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Ext_list_test.ref_pop",
+    Error: new Error()
+  };
 }
 
 function rev_except_last(xs) {
@@ -839,9 +839,9 @@ function rev_except_last(xs) {
       var x = xs$1.hd;
       if (!xs$2) {
         return [
-                acc,
-                x
-              ];
+          acc,
+          x
+        ];
       }
       _xs = xs$2;
       _acc = {
@@ -851,10 +851,10 @@ function rev_except_last(xs) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.rev_except_last",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_list_test.rev_except_last",
+      Error: new Error()
+    };
   };
 }
 
@@ -876,10 +876,10 @@ function last(_xs) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.last",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_list_test.last",
+      Error: new Error()
+    };
   };
 }
 
@@ -898,14 +898,14 @@ function assoc_by_string(def, k, _lst) {
       return Caml_option.valFromOption(def);
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ext_list_test.res",
-            472,
-            14
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "ext_list_test.res",
+        472,
+        14
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -924,14 +924,14 @@ function assoc_by_int(def, k, _lst) {
       return Caml_option.valFromOption(def);
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ext_list_test.res",
-            487,
-            14
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "ext_list_test.res",
+        487,
+        14
+      ],
+      Error: new Error()
+    };
   };
 }
 
diff --git a/jscomp/test/ext_pervasives_test.js b/jscomp/test/ext_pervasives_test.js
index 31a1bccb71b..84110a5f001 100644
--- a/jscomp/test/ext_pervasives_test.js
+++ b/jscomp/test/ext_pervasives_test.js
@@ -39,9 +39,9 @@ function is_pos_pow(n) {
         continue ;
       }
       throw {
-            RE_EXN_ID: E,
-            Error: new Error()
-          };
+        RE_EXN_ID: E,
+        Error: new Error()
+      };
     };
   }
   catch (raw_exn){
@@ -73,9 +73,9 @@ function is_pos_pow_2(n) {
         continue ;
       }
       throw {
-            RE_EXN_ID: E,
-            Error: new Error()
-          };
+        RE_EXN_ID: E,
+        Error: new Error()
+      };
     };
   }
   catch (raw_exn){
diff --git a/jscomp/test/ext_string_test.js b/jscomp/test/ext_string_test.js
index 8f2272a2b85..8e599422ebe 100644
--- a/jscomp/test/ext_string_test.js
+++ b/jscomp/test/ext_string_test.js
@@ -26,9 +26,9 @@ function split_by(keep_emptyOpt, is_delim, str) {
         return acc;
       } else {
         return {
-                hd: $$String.sub(str, 0, last_pos),
-                tl: acc
-              };
+          hd: $$String.sub(str, 0, last_pos),
+          tl: acc
+        };
       }
     }
     if (Curry._1(is_delim, Caml_string.get(str, pos))) {
@@ -84,19 +84,19 @@ function split(keep_empty, str, on) {
     return /* [] */0;
   } else {
     return split_by(keep_empty, (function (x) {
-                  return x === on;
-                }), str);
+            return x === on;
+          }), str);
   }
 }
 
 function quick_split_by_ws(str) {
   return split_by(false, (function (x) {
-                if (x === /* '\t' */9 || x === /* '\n' */10) {
-                  return true;
-                } else {
-                  return x === /* ' ' */32;
-                }
-              }), str);
+          if (x === /* '\t' */9 || x === /* '\n' */10) {
+            return true;
+          } else {
+            return x === /* ' ' */32;
+          }
+        }), str);
 }
 
 function starts_with(s, beg) {
@@ -149,8 +149,8 @@ function ends_with_then_chop(s, beg) {
 
 function check_any_suffix_case(s, suffixes) {
   return List.exists((function (x) {
-                return ends_with(s, x);
-              }), suffixes);
+          return ends_with(s, x);
+        }), suffixes);
 }
 
 function check_any_suffix_case_then_chop(s, suffixes) {
@@ -219,10 +219,10 @@ function for_all_range(s, start, finish, p) {
   var len = s.length;
   if (start < 0 || finish >= len) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.for_all_range",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_string_test.for_all_range",
+      Error: new Error()
+    };
   }
   return unsafe_for_all_range(s, start, finish, p);
 }
@@ -274,9 +274,9 @@ function find(startOpt, sub, s) {
     while((i + n | 0) <= s_len) {
       if (unsafe_is_sub(sub, 0, s, i, n)) {
         throw {
-              RE_EXN_ID: Local_exit,
-              Error: new Error()
-            };
+          RE_EXN_ID: Local_exit,
+          Error: new Error()
+        };
       }
       i = i + 1 | 0;
     };
@@ -299,10 +299,10 @@ function non_overlap_count(sub, s) {
   var sub_len = sub.length;
   if (sub.length === 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.non_overlap_count",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_string_test.non_overlap_count",
+      Error: new Error()
+    };
   }
   var _acc = 0;
   var _off = 0;
@@ -326,9 +326,9 @@ function rfind(sub, s) {
     while(i >= 0) {
       if (unsafe_is_sub(sub, 0, s, i, n)) {
         throw {
-              RE_EXN_ID: Local_exit,
-              Error: new Error()
-            };
+          RE_EXN_ID: Local_exit,
+          Error: new Error()
+        };
       }
       i = i - 1 | 0;
     };
@@ -350,10 +350,10 @@ function tail_from(s, x) {
   }
   var s$1 = "Ext_string_test.tail_from " + (s + (" : " + String(x)));
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s$1,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s$1,
+    Error: new Error()
+  };
 }
 
 function digits_of_str(s, offset, x) {
@@ -444,18 +444,18 @@ function is_valid_module_file(s) {
     return false;
   }
   return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
-                if (x >= 65) {
-                  if (x > 96 || x < 91) {
-                    return x < 123;
-                  } else {
-                    return x === 95;
-                  }
-                } else if (x >= 48) {
-                  return x < 58;
-                } else {
-                  return x === 39;
-                }
-              }));
+          if (x >= 65) {
+            if (x > 96 || x < 91) {
+              return x < 123;
+            } else {
+              return x === 95;
+            }
+          } else if (x >= 48) {
+            return x < 58;
+          } else {
+            return x === 39;
+          }
+        }));
 }
 
 function is_valid_npm_package_name(s) {
@@ -476,18 +476,18 @@ function is_valid_npm_package_name(s) {
     return false;
   }
   return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
-                if (x >= 58) {
-                  if (x >= 97) {
-                    return x < 123;
-                  } else {
-                    return x === 95;
-                  }
-                } else if (x !== 45) {
-                  return x >= 48;
-                } else {
-                  return true;
-                }
-              }));
+          if (x >= 58) {
+            if (x >= 97) {
+              return x < 123;
+            } else {
+              return x === 95;
+            }
+          } else if (x !== 45) {
+            return x >= 48;
+          } else {
+            return true;
+          }
+        }));
 }
 
 function is_valid_source_name(name) {
@@ -547,10 +547,10 @@ function no_char(x, ch, i, len) {
   var str_len = x.length;
   if (i < 0 || i >= str_len || len >= str_len) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.no_char",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Ext_string_test.no_char",
+      Error: new Error()
+    };
   }
   return unsafe_no_char(x, ch, i, len);
 }
@@ -569,12 +569,12 @@ function replace_slash_backward(x) {
     return x;
   } else {
     return $$String.map((function (x) {
-                  if (x !== 47) {
-                    return x;
-                  } else {
-                    return /* '\\' */92;
-                  }
-                }), x);
+            if (x !== 47) {
+              return x;
+            } else {
+              return /* '\\' */92;
+            }
+          }), x);
   }
 }
 
@@ -584,12 +584,12 @@ function replace_backward_slash(x) {
     return x;
   } else {
     return $$String.map((function (x) {
-                  if (x !== 92) {
-                    return x;
-                  } else {
-                    return /* '/' */47;
-                  }
-                }), x);
+            if (x !== 92) {
+              return x;
+            } else {
+              return /* '/' */47;
+            }
+          }), x);
   }
 }
 
diff --git a/jscomp/test/extensible_variant_test.js b/jscomp/test/extensible_variant_test.js
index 86cc35922aa..578c9f165de 100644
--- a/jscomp/test/extensible_variant_test.js
+++ b/jscomp/test/extensible_variant_test.js
@@ -25,28 +25,28 @@ function to_int(x) {
     return x._2;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "extensible_variant_test.res",
-          16,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "extensible_variant_test.res",
+      16,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 var suites_0 = [
   "test_int",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 3,
-              _1: to_int({
-                    RE_EXN_ID: Int,
-                    _1: 3,
-                    _2: 0
-                  })
-            };
+        TAG: "Eq",
+        _0: 3,
+        _1: to_int({
+              RE_EXN_ID: Int,
+              _1: 3,
+              _2: 0
+            })
+      };
     })
 ];
 
@@ -55,14 +55,14 @@ var suites_1 = {
     "test_int2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 0,
-                _1: to_int({
-                      RE_EXN_ID: Int$1,
-                      _1: 3,
-                      _2: 0
-                    })
-              };
+          TAG: "Eq",
+          _0: 0,
+          _1: to_int({
+                RE_EXN_ID: Int$1,
+                _1: 3,
+                _2: 0
+              })
+        };
       })
   ],
   tl: {
@@ -70,13 +70,13 @@ var suites_1 = {
       "test_string",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: -1,
-                  _1: to_int({
-                        RE_EXN_ID: Str,
-                        _1: "x"
-                      })
-                };
+            TAG: "Eq",
+            _0: -1,
+            _1: to_int({
+                  RE_EXN_ID: Str,
+                  _1: "x"
+                })
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/ffi_arity_test.js b/jscomp/test/ffi_arity_test.js
index 500d287b133..655c75b977d 100644
--- a/jscomp/test/ffi_arity_test.js
+++ b/jscomp/test/ffi_arity_test.js
@@ -73,14 +73,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
         "File \"ffi_arity_test.res\", line 51, characters 7-14",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: [
-                      0,
-                      1,
-                      4
-                    ]
-                  };
+              TAG: "Eq",
+              _0: v,
+              _1: [
+                0,
+                1,
+                4
+              ]
+            };
           })
       ],
       tl: {
@@ -88,14 +88,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
           "File \"ffi_arity_test.res\", line 52, characters 7-14",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: vv,
-                      _1: [
-                        1,
-                        3,
-                        5
-                      ]
-                    };
+                TAG: "Eq",
+                _0: vv,
+                _1: [
+                  1,
+                  3,
+                  5
+                ]
+              };
             })
         ],
         tl: {
@@ -103,14 +103,14 @@ Mt.from_pair_suites("Ffi_arity_test", {
             "File \"ffi_arity_test.res\", line 53, characters 7-14",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: hh,
-                        _1: [
-                          1,
-                          2,
-                          3
-                        ]
-                      };
+                  TAG: "Eq",
+                  _0: hh,
+                  _1: [
+                    1,
+                    2,
+                    3
+                  ]
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/ffi_array_test.js b/jscomp/test/ffi_array_test.js
index 13e53df09a6..4bf2e61a96d 100644
--- a/jscomp/test/ffi_array_test.js
+++ b/jscomp/test/ffi_array_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/ffi_js_test.js b/jscomp/test/ffi_js_test.js
index 9bb47fecd8e..b25a2128215 100644
--- a/jscomp/test/ffi_js_test.js
+++ b/jscomp/test/ffi_js_test.js
@@ -29,10 +29,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -123,10 +123,10 @@ function vvvv(z) {
 
 function create_prim(param) {
   return {
-          "x'": 3,
-          "x''": 3,
-          "x''''": 2
-        };
+    "x'": 3,
+    "x''": 3,
+    "x''''": 2
+  };
 }
 
 function ffff(x) {
diff --git a/jscomp/test/ffi_splice_test.js b/jscomp/test/ffi_splice_test.js
index a0ee3abbb4c..c82b48c80b3 100644
--- a/jscomp/test/ffi_splice_test.js
+++ b/jscomp/test/ffi_splice_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/flexible_array_test.js b/jscomp/test/flexible_array_test.js
index 3201263a66c..7f5b80995ca 100644
--- a/jscomp/test/flexible_array_test.js
+++ b/jscomp/test/flexible_array_test.js
@@ -12,9 +12,9 @@ function sub(_tr, _k) {
     var tr = _tr;
     if (typeof tr !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (k === 1) {
       return tr._0;
@@ -34,51 +34,51 @@ function update(tr, k, w) {
   if (typeof tr !== "object") {
     if (k === 1) {
       return {
-              TAG: "Br",
-              _0: w,
-              _1: "Lf",
-              _2: "Lf"
-            };
+        TAG: "Br",
+        _0: w,
+        _1: "Lf",
+        _2: "Lf"
+      };
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var r = tr._2;
   var l = tr._1;
   if (k === 1) {
     return {
-            TAG: "Br",
-            _0: w,
-            _1: l,
-            _2: r
-          };
+      TAG: "Br",
+      _0: w,
+      _1: l,
+      _2: r
+    };
   }
   var v = tr._0;
   if (k % 2 === 0) {
     return {
-            TAG: "Br",
-            _0: v,
-            _1: update(l, k / 2 | 0, w),
-            _2: r
-          };
+      TAG: "Br",
+      _0: v,
+      _1: update(l, k / 2 | 0, w),
+      _2: r
+    };
   } else {
     return {
-            TAG: "Br",
-            _0: v,
-            _1: l,
-            _2: update(r, k / 2 | 0, w)
-          };
+      TAG: "Br",
+      _0: v,
+      _1: l,
+      _2: update(r, k / 2 | 0, w)
+    };
   }
 }
 
 function $$delete(tr, n) {
   if (typeof tr !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   if (n === 1) {
     return "Lf";
@@ -88,68 +88,68 @@ function $$delete(tr, n) {
   var v = tr._0;
   if (n % 2 === 0) {
     return {
-            TAG: "Br",
-            _0: v,
-            _1: $$delete(l, n / 2 | 0),
-            _2: r
-          };
+      TAG: "Br",
+      _0: v,
+      _1: $$delete(l, n / 2 | 0),
+      _2: r
+    };
   } else {
     return {
-            TAG: "Br",
-            _0: v,
-            _1: l,
-            _2: $$delete(r, n / 2 | 0)
-          };
+      TAG: "Br",
+      _0: v,
+      _1: l,
+      _2: $$delete(r, n / 2 | 0)
+    };
   }
 }
 
 function loext(tr, w) {
   if (typeof tr !== "object") {
     return {
-            TAG: "Br",
-            _0: w,
-            _1: "Lf",
-            _2: "Lf"
-          };
+      TAG: "Br",
+      _0: w,
+      _1: "Lf",
+      _2: "Lf"
+    };
   } else {
     return {
-            TAG: "Br",
-            _0: w,
-            _1: loext(tr._2, tr._0),
-            _2: tr._1
-          };
+      TAG: "Br",
+      _0: w,
+      _1: loext(tr._2, tr._0),
+      _2: tr._1
+    };
   }
 }
 
 function lorem(tr) {
   if (typeof tr !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var l = tr._1;
   if (typeof l === "object") {
     return {
-            TAG: "Br",
-            _0: l._0,
-            _1: tr._2,
-            _2: lorem(l)
-          };
+      TAG: "Br",
+      _0: l._0,
+      _1: tr._2,
+      _2: lorem(l)
+    };
   }
   var tmp = tr._2;
   if (typeof tmp !== "object") {
     return "Lf";
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "flexible_array_test.res",
-          80,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "flexible_array_test.res",
+      80,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 var empty = [
@@ -166,70 +166,70 @@ function get(param, i) {
     return sub(param[0], i + 1 | 0);
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.get",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Array.get",
+    Error: new Error()
+  };
 }
 
 function set(param, i, v) {
   var k = param[1];
   if (i >= 0 && i < k) {
     return [
-            update(param[0], i + 1 | 0, v),
-            k
-          ];
+      update(param[0], i + 1 | 0, v),
+      k
+    ];
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.set",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Array.set",
+    Error: new Error()
+  };
 }
 
 function push_front(param, v) {
   return [
-          loext(param[0], v),
-          param[1] + 1 | 0
-        ];
+    loext(param[0], v),
+    param[1] + 1 | 0
+  ];
 }
 
 function pop_front(param) {
   var k = param[1];
   if (k > 0) {
     return [
-            lorem(param[0]),
-            k - 1 | 0
-          ];
+      lorem(param[0]),
+      k - 1 | 0
+    ];
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.pop_front",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Array.pop_front",
+    Error: new Error()
+  };
 }
 
 function push_back(param, v) {
   var k = param[1];
   return [
-          update(param[0], k + 1 | 0, v),
-          k + 1 | 0
-        ];
+    update(param[0], k + 1 | 0, v),
+    k + 1 | 0
+  ];
 }
 
 function pop_back(param) {
   var k = param[1];
   if (k > 0) {
     return [
-            $$delete(param[0], k),
-            k - 1 | 0
-          ];
+      $$delete(param[0], k),
+      k - 1 | 0
+    ];
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.pop_back",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Array.pop_back",
+    Error: new Error()
+  };
 }
 
 function filter_from(i, p, s) {
@@ -318,14 +318,14 @@ if (!Caml_obj.equal(x, of_array([
             6
           ]))) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "flexible_array_test.res",
-          184,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "flexible_array_test.res",
+      184,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var v = $$Array.init(500, (function (i) {
diff --git a/jscomp/test/float_array.js b/jscomp/test/float_array.js
index d859178ac55..148cd530029 100644
--- a/jscomp/test/float_array.js
+++ b/jscomp/test/float_array.js
@@ -4,61 +4,61 @@
 
 function small_float_array(x) {
   return [
-          [
-            1,
-            2,
-            3
-          ],
-          x
-        ];
+    [
+      1,
+      2,
+      3
+    ],
+    x
+  ];
 }
 
 function longer_float_array(x) {
   return [
-          [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0
-          ],
-          x
-        ];
+    [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      0
+    ],
+    x
+  ];
 }
 
 exports.small_float_array = small_float_array;
diff --git a/jscomp/test/float_of_bits_test.js b/jscomp/test/float_of_bits_test.js
index 7bc29010c21..ff1db3580cc 100644
--- a/jscomp/test/float_of_bits_test.js
+++ b/jscomp/test/float_of_bits_test.js
@@ -26,34 +26,34 @@ var int32_pairs = [
 
 function from_pairs(pair) {
   return List.concat($$Array.to_list($$Array.mapi((function (i, param) {
-                        var f = param[1];
-                        var i32 = param[0];
-                        return {
-                                hd: [
-                                  "int32_float_of_bits " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: Caml_float.int_float_of_bits(i32),
-                                              _1: f
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "int32_bits_of_float " + i,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_float.int_bits_of_float(f),
-                                                _1: i32
-                                              };
-                                      })
-                                  ],
-                                  tl: /* [] */0
-                                }
-                              };
-                      }), int32_pairs)));
+                  var f = param[1];
+                  var i32 = param[0];
+                  return {
+                    hd: [
+                      "int32_float_of_bits " + i,
+                      (function (param) {
+                          return {
+                            TAG: "Eq",
+                            _0: Caml_float.int_float_of_bits(i32),
+                            _1: f
+                          };
+                        })
+                    ],
+                    tl: {
+                      hd: [
+                        "int32_bits_of_float " + i,
+                        (function (param) {
+                            return {
+                              TAG: "Eq",
+                              _0: Caml_float.int_bits_of_float(f),
+                              _1: i32
+                            };
+                          })
+                      ],
+                      tl: /* [] */0
+                    }
+                  };
+                }), int32_pairs)));
 }
 
 var suites = Pervasives.$at({
@@ -61,10 +61,10 @@ var suites = Pervasives.$at({
         "one",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: Caml_int64.bits_of_float(1.0),
-                    _1: one_float
-                  };
+              TAG: "Eq",
+              _0: Caml_int64.bits_of_float(1.0),
+              _1: one_float
+            };
           })
       ],
       tl: {
@@ -72,10 +72,10 @@ var suites = Pervasives.$at({
           "two",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: Caml_int64.float_of_bits(one_float),
-                      _1: 1.0
-                    };
+                TAG: "Eq",
+                _0: Caml_int64.float_of_bits(one_float),
+                _1: 1.0
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/float_test.js b/jscomp/test/float_test.js
index ab342bdb894..f8af860f885 100644
--- a/jscomp/test/float_test.js
+++ b/jscomp/test/float_test.js
@@ -123,19 +123,19 @@ var results = $$Array.append([
 
 function from_pairs(ps) {
   return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[1];
-                    var a = param[0];
-                    return [
-                            "pair " + i,
-                            (function (param) {
-                                return {
-                                        TAG: "Approx",
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
-                  }), ps));
+              var b = param[1];
+              var a = param[0];
+              return [
+                "pair " + i,
+                (function (param) {
+                    return {
+                      TAG: "Approx",
+                      _0: a,
+                      _1: b
+                    };
+                  })
+              ];
+            }), ps));
 }
 
 var float_compare = Caml.float_compare;
@@ -331,10 +331,10 @@ Mt.from_pair_suites("Float_test", Pervasives.$at({
             "mod_float",
             (function (param) {
                 return {
-                        TAG: "Approx",
-                        _0: 3.2 % 0.5,
-                        _1: 0.200000000000000178
-                      };
+                  TAG: "Approx",
+                  _0: 3.2 % 0.5,
+                  _1: 0.200000000000000178
+                };
               })
           ],
           tl: {
@@ -342,10 +342,10 @@ Mt.from_pair_suites("Float_test", Pervasives.$at({
               "modf_float1",
               (function (param) {
                   return {
-                          TAG: "Approx",
-                          _0: a,
-                          _1: 0.299999999999997158
-                        };
+                    TAG: "Approx",
+                    _0: a,
+                    _1: 0.299999999999997158
+                  };
                 })
             ],
             tl: {
@@ -353,10 +353,10 @@ Mt.from_pair_suites("Float_test", Pervasives.$at({
                 "modf_float2",
                 (function (param) {
                     return {
-                            TAG: "Approx",
-                            _0: b,
-                            _1: 32
-                          };
+                      TAG: "Approx",
+                      _0: b,
+                      _1: 32
+                    };
                   })
               ],
               tl: {
@@ -364,10 +364,10 @@ Mt.from_pair_suites("Float_test", Pervasives.$at({
                   "int_of_float",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: 3,
-                              _1: 3
-                            };
+                        TAG: "Eq",
+                        _0: 3,
+                        _1: 3
+                      };
                     })
                 ],
                 tl: /* [] */0
diff --git a/jscomp/test/for_loop_test.js b/jscomp/test/for_loop_test.js
index 9b6a0b1e221..83ba006927c 100644
--- a/jscomp/test/for_loop_test.js
+++ b/jscomp/test/for_loop_test.js
@@ -108,11 +108,11 @@ function for_6(x, u) {
           Curry._1(x, undefined);
         }), arr);
   return [
-          v.contents,
-          v4.contents,
-          v5.contents,
-          inspect_3
-        ];
+    v.contents,
+    v4.contents,
+    v5.contents,
+    inspect_3
+  ];
 }
 
 function for_7(param) {
@@ -214,20 +214,20 @@ function for_9(param) {
           Curry._1(f, undefined);
         }), arr2);
   return [[
-            vv.contents,
-            $$Array.of_list(List.rev(v.contents)),
-            vv2.contents
-          ]];
+      vv.contents,
+      $$Array.of_list(List.rev(v.contents)),
+      vv2.contents
+    ]];
 }
 
 var suites_0 = [
   "for_loop_test_3",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 90,
-              _1: for_3(Caml_array.make(10, 2))
-            };
+        TAG: "Eq",
+        _0: 90,
+        _1: for_3(Caml_array.make(10, 2))
+      };
     })
 ];
 
@@ -236,10 +236,10 @@ var suites_1 = {
     "for_loop_test_4",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 180,
-                _1: for_4(Caml_array.make(10, 2))
-              };
+          TAG: "Eq",
+          _0: 180,
+          _1: for_4(Caml_array.make(10, 2))
+        };
       })
   ],
   tl: {
@@ -247,10 +247,10 @@ var suites_1 = {
       "for_loop_test_5",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: 2420,
-                  _1: for_5(Caml_array.make(10, 2), 11)
-                };
+            TAG: "Eq",
+            _0: 2420,
+            _1: for_5(Caml_array.make(10, 2), 11)
+          };
         })
     ],
     tl: {
@@ -258,15 +258,15 @@ var suites_1 = {
         "for_loop_test_6",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: [
-                      30,
-                      1,
-                      2,
-                      3
-                    ],
-                    _1: for_6(Caml_array.make(3, 0), 0)
-                  };
+              TAG: "Eq",
+              _0: [
+                30,
+                1,
+                2,
+                3
+              ],
+              _1: for_6(Caml_array.make(3, 0), 0)
+            };
           })
       ],
       tl: {
@@ -274,10 +274,10 @@ var suites_1 = {
           "for_loop_test_7",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 84,
-                      _1: for_7()
-                    };
+                TAG: "Eq",
+                _0: 84,
+                _1: for_7()
+              };
             })
         ],
         tl: {
@@ -285,10 +285,10 @@ var suites_1 = {
             "for_loop_test_8",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 294,
-                        _1: for_8()
-                      };
+                  TAG: "Eq",
+                  _0: 294,
+                  _1: for_8()
+                };
               })
           ],
           tl: {
@@ -296,19 +296,19 @@ var suites_1 = {
               "for_loop_test_9",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: [[
-                              10,
-                              [
-                                1,
-                                2,
-                                2,
-                                3
-                              ],
-                              5
-                            ]],
-                          _1: for_9()
-                        };
+                    TAG: "Eq",
+                    _0: [[
+                        10,
+                        [
+                          1,
+                          2,
+                          2,
+                          3
+                        ],
+                        5
+                      ]],
+                    _1: for_9()
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/for_side_effect_test.js b/jscomp/test/for_side_effect_test.js
index e770b029410..8e0ed3cb60a 100644
--- a/jscomp/test/for_side_effect_test.js
+++ b/jscomp/test/for_side_effect_test.js
@@ -23,10 +23,10 @@ var suites_0 = [
   "for_order",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 10,
-              _1: test2()
-            };
+        TAG: "Eq",
+        _0: 10,
+        _1: test2()
+      };
     })
 ];
 
diff --git a/jscomp/test/format_regression.js b/jscomp/test/format_regression.js
index df30f34ff6f..8249ea818e6 100644
--- a/jscomp/test/format_regression.js
+++ b/jscomp/test/format_regression.js
@@ -5,50 +5,50 @@ var Curry = require("../../lib/js/curry.js");
 
 function peek_queue(param) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          10,
-          22
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "format_regression.res",
+      10,
+      22
+    ],
+    Error: new Error()
+  };
 }
 
 function int_of_size(param) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          11,
-          23
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "format_regression.res",
+      11,
+      23
+    ],
+    Error: new Error()
+  };
 }
 
 function take_queue(param) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          12,
-          22
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "format_regression.res",
+      12,
+      22
+    ],
+    Error: new Error()
+  };
 }
 
 function format_pp_token(param, param$1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          13,
-          32
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "format_regression.res",
+      13,
+      32
+    ],
+    Error: new Error()
+  };
 }
 
 function advance_loop(state) {
diff --git a/jscomp/test/format_test.js b/jscomp/test/format_test.js
index 622709d918a..e3602f80feb 100644
--- a/jscomp/test/format_test.js
+++ b/jscomp/test/format_test.js
@@ -22,10 +22,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/fun_pattern_match.js b/jscomp/test/fun_pattern_match.js
index 25975a53c37..2b143273d35 100644
--- a/jscomp/test/fun_pattern_match.js
+++ b/jscomp/test/fun_pattern_match.js
@@ -25,14 +25,14 @@ function f3(param) {
       rhs === "Uninitialized";
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "fun_pattern_match.res",
-            33,
-            9
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "fun_pattern_match.res",
+        33,
+        9
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -49,14 +49,14 @@ function f4(param) {
       rhs === "Uninitialized";
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "fun_pattern_match.res",
-            39,
-            9
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "fun_pattern_match.res",
+        39,
+        9
+      ],
+      Error: new Error()
+    };
   };
 }
 
diff --git a/jscomp/test/functor_app_test.js b/jscomp/test/functor_app_test.js
index 635ae811b6e..2de9a59f612 100644
--- a/jscomp/test/functor_app_test.js
+++ b/jscomp/test/functor_app_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/functor_def.js b/jscomp/test/functor_def.js
index fb80c5df15a..b2945788967 100644
--- a/jscomp/test/functor_def.js
+++ b/jscomp/test/functor_def.js
@@ -22,8 +22,8 @@ function Make(U) {
     return Curry._2(U.say, x$1, x$1);
   };
   return {
-          h: h
-        };
+    h: h
+  };
 }
 
 exports.v = v;
diff --git a/jscomp/test/functor_ffi.js b/jscomp/test/functor_ffi.js
index 8c33a76f46f..74c1029b401 100644
--- a/jscomp/test/functor_ffi.js
+++ b/jscomp/test/functor_ffi.js
@@ -8,8 +8,8 @@ function Make(S) {
     return Caml_option.undefined_to_opt(f[i]);
   };
   return {
-          opt_get: opt_get
-        };
+    opt_get: opt_get
+  };
 }
 
 function opt_get(f, i) {
@@ -22,9 +22,9 @@ var Int_arr = {
 
 function f(v) {
   return [
-          v[0],
-          Caml_option.undefined_to_opt(v[1])
-        ];
+    v[0],
+    Caml_option.undefined_to_opt(v[1])
+  ];
 }
 
 exports.Make = Make;
diff --git a/jscomp/test/functors.js b/jscomp/test/functors.js
index c4d2a5fa779..f1487cdd443 100644
--- a/jscomp/test/functors.js
+++ b/jscomp/test/functors.js
@@ -11,9 +11,9 @@ function O(X) {
     return 1 + Curry._1(X.foo, x) | 0;
   };
   return {
-          cow: cow,
-          sheep: sheep
-        };
+    cow: cow,
+    sheep: sheep
+  };
 }
 
 function F(X, Y) {
@@ -24,9 +24,9 @@ function F(X, Y) {
     return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
   };
   return {
-          cow: cow,
-          sheep: sheep
-        };
+    cow: cow,
+    sheep: sheep
+  };
 }
 
 function F1(X, Y) {
@@ -34,8 +34,8 @@ function F1(X, Y) {
     return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
   };
   return {
-          sheep: sheep
-        };
+    sheep: sheep
+  };
 }
 
 function F2(X, Y) {
@@ -43,8 +43,8 @@ function F2(X, Y) {
     return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
   };
   return {
-          sheep: sheep
-        };
+    sheep: sheep
+  };
 }
 
 var M = {
@@ -53,8 +53,8 @@ var M = {
         return 1 + Curry._1(funarg$1.foo, Curry._1(funarg.foo, x)) | 0;
       };
       return {
-              sheep: sheep
-            };
+        sheep: sheep
+      };
     })
 };
 
diff --git a/jscomp/test/genlex_test.js b/jscomp/test/genlex_test.js
index 8809d35a3c2..6c043ca4ce9 100644
--- a/jscomp/test/genlex_test.js
+++ b/jscomp/test/genlex_test.js
@@ -60,52 +60,52 @@ var suites_0 = [
   "lexer_stream_genlex",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: {
+        TAG: "Eq",
+        _0: {
+          hd: {
+            TAG: "Int",
+            _0: 3
+          },
+          tl: {
+            hd: {
+              TAG: "Kwd",
+              _0: "("
+            },
+            tl: {
+              hd: {
+                TAG: "Int",
+                _0: 3
+              },
+              tl: {
                 hd: {
-                  TAG: "Int",
-                  _0: 3
+                  TAG: "Kwd",
+                  _0: "+"
                 },
                 tl: {
                   hd: {
-                    TAG: "Kwd",
-                    _0: "("
+                    TAG: "Int",
+                    _0: 2
                   },
                   tl: {
                     hd: {
                       TAG: "Int",
-                      _0: 3
+                      _0: -1
                     },
                     tl: {
                       hd: {
                         TAG: "Kwd",
-                        _0: "+"
+                        _0: ")"
                       },
-                      tl: {
-                        hd: {
-                          TAG: "Int",
-                          _0: 2
-                        },
-                        tl: {
-                          hd: {
-                            TAG: "Int",
-                            _0: -1
-                          },
-                          tl: {
-                            hd: {
-                              TAG: "Kwd",
-                              _0: ")"
-                            },
-                            tl: /* [] */0
-                          }
-                        }
-                      }
+                      tl: /* [] */0
                     }
                   }
                 }
-              },
-              _1: to_list(lexer(Stream.of_string("3(3 + 2 -1)")))
-            };
+              }
+            }
+          }
+        },
+        _1: to_list(lexer(Stream.of_string("3(3 + 2 -1)")))
+      };
     })
 ];
 
diff --git a/jscomp/test/global_exception_regression_test.js b/jscomp/test/global_exception_regression_test.js
index b97e697256f..efabf98f12d 100644
--- a/jscomp/test/global_exception_regression_test.js
+++ b/jscomp/test/global_exception_regression_test.js
@@ -19,10 +19,10 @@ var suites_0 = [
   "not_found_equal",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: u,
-              _1: v
-            };
+        TAG: "Eq",
+        _0: u,
+        _1: v
+      };
     })
 ];
 
@@ -31,10 +31,10 @@ var suites_1 = {
     "not_found_not_equal_end_of_file",
     (function (param) {
         return {
-                TAG: "Neq",
-                _0: u,
-                _1: s
-              };
+          TAG: "Neq",
+          _0: u,
+          _1: s
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/global_module_alias_test.js b/jscomp/test/global_module_alias_test.js
index 991a40febb1..31d17ca13ac 100644
--- a/jscomp/test/global_module_alias_test.js
+++ b/jscomp/test/global_module_alias_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -89,18 +89,18 @@ eq("File \"global_module_alias_test.res\", line 52, characters 12-19", v.content
 
 function g(param) {
   return List.length({
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            });
+        hd: 1,
+        tl: {
+          hd: 2,
+          tl: {
+            hd: 3,
+            tl: {
+              hd: 4,
+              tl: /* [] */0
+            }
+          }
+        }
+      });
 }
 
 function xx(param) {
diff --git a/jscomp/test/google_closure_test.js b/jscomp/test/google_closure_test.js
index 42dd98b6675..0083eab47af 100644
--- a/jscomp/test/google_closure_test.js
+++ b/jscomp/test/google_closure_test.js
@@ -9,21 +9,21 @@ Mt.from_pair_suites("Closure", {
         "partial",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: [
-                      Test_google_closure.a,
-                      Test_google_closure.b,
-                      Test_google_closure.c
-                    ],
-                    _1: [
-                      "3",
-                      101,
-                      [
-                        1,
-                        2
-                      ]
-                    ]
-                  };
+              TAG: "Eq",
+              _0: [
+                Test_google_closure.a,
+                Test_google_closure.b,
+                Test_google_closure.c
+              ],
+              _1: [
+                "3",
+                101,
+                [
+                  1,
+                  2
+                ]
+              ]
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/gpr496_test.js b/jscomp/test/gpr496_test.js
index 5931bf9895c..6fd8217bc77 100644
--- a/jscomp/test/gpr496_test.js
+++ b/jscomp/test/gpr496_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1150.js b/jscomp/test/gpr_1150.js
index 034cd50364a..1476eab8431 100644
--- a/jscomp/test/gpr_1150.js
+++ b/jscomp/test/gpr_1150.js
@@ -15,234 +15,234 @@ function f(children) {
   var a1 = children$1.hd;
   if (!children$2) {
     return [
-            a0,
-            a1
-          ];
+      a0,
+      a1
+    ];
   }
   var children$3 = children$2.tl;
   var a2 = children$2.hd;
   if (!children$3) {
     return [
-            a0,
-            a1,
-            a2
-          ];
+      a0,
+      a1,
+      a2
+    ];
   }
   var children$4 = children$3.tl;
   var a3 = children$3.hd;
   if (!children$4) {
     return [
-            a0,
-            a1,
-            a2,
-            a3
-          ];
+      a0,
+      a1,
+      a2,
+      a3
+    ];
   }
   var children$5 = children$4.tl;
   var a4 = children$4.hd;
   if (!children$5) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4
+    ];
   }
   var children$6 = children$5.tl;
   var a5 = children$5.hd;
   if (!children$6) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5
+    ];
   }
   var children$7 = children$6.tl;
   var a6 = children$6.hd;
   if (!children$7) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6
+    ];
   }
   var children$8 = children$7.tl;
   var a7 = children$7.hd;
   if (!children$8) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7
+    ];
   }
   var children$9 = children$8.tl;
   var a8 = children$8.hd;
   if (!children$9) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8
+    ];
   }
   var children$10 = children$9.tl;
   var a9 = children$9.hd;
   if (!children$10) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9
+    ];
   }
   var children$11 = children$10.tl;
   var a10 = children$10.hd;
   if (!children$11) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9,
+      a10
+    ];
   }
   var children$12 = children$11.tl;
   var a11 = children$11.hd;
   if (!children$12) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9,
+      a10,
+      a11
+    ];
   }
   var children$13 = children$12.tl;
   var a12 = children$12.hd;
   if (!children$13) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9,
+      a10,
+      a11,
+      a12
+    ];
   }
   var children$14 = children$13.tl;
   var a13 = children$13.hd;
   if (!children$14) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12,
-            a13
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9,
+      a10,
+      a11,
+      a12,
+      a13
+    ];
   }
   var children$15 = children$14.tl;
   var a14 = children$14.hd;
   if (!children$15) {
     return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12,
-            a13,
-            a14
-          ];
+      a0,
+      a1,
+      a2,
+      a3,
+      a4,
+      a5,
+      a6,
+      a7,
+      a8,
+      a9,
+      a10,
+      a11,
+      a12,
+      a13,
+      a14
+    ];
   }
   if (children$15.tl) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_1150.res",
-            100,
-            62
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "gpr_1150.res",
+        100,
+        62
+      ],
+      Error: new Error()
+    };
   }
   return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          children$15.hd
-        ];
+    a0,
+    a1,
+    a2,
+    a3,
+    a4,
+    a5,
+    a6,
+    a7,
+    a8,
+    a9,
+    a10,
+    a11,
+    a12,
+    a13,
+    a14,
+    children$15.hd
+  ];
 }
 
 exports.f = f;
diff --git a/jscomp/test/gpr_1154_test.js b/jscomp/test/gpr_1154_test.js
index fb4ee3ec5b1..7ccf80d0513 100644
--- a/jscomp/test/gpr_1154_test.js
+++ b/jscomp/test/gpr_1154_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1240_missing_unbox.js b/jscomp/test/gpr_1240_missing_unbox.js
index 241dcb3e7f4..c0d74864a7b 100644
--- a/jscomp/test/gpr_1240_missing_unbox.js
+++ b/jscomp/test/gpr_1240_missing_unbox.js
@@ -6,9 +6,9 @@ function f(x, y) {
   var x$1 = x;
   var y$1 = y;
   return [
-          x$1,
-          y$1
-        ];
+    x$1,
+    y$1
+  ];
 }
 
 exports.f = f;
diff --git a/jscomp/test/gpr_1409_test.js b/jscomp/test/gpr_1409_test.js
index 80826b91938..51a334deb7e 100644
--- a/jscomp/test/gpr_1409_test.js
+++ b/jscomp/test/gpr_1409_test.js
@@ -22,10 +22,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1423_app_test.js b/jscomp/test/gpr_1423_app_test.js
index a152b159d4e..f4af92b57b5 100644
--- a/jscomp/test/gpr_1423_app_test.js
+++ b/jscomp/test/gpr_1423_app_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1503_test.js b/jscomp/test/gpr_1503_test.js
index 160ee23a235..20a78ce5b9d 100644
--- a/jscomp/test/gpr_1503_test.js
+++ b/jscomp/test/gpr_1503_test.js
@@ -21,10 +21,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1658_test.js b/jscomp/test/gpr_1658_test.js
index b4d2747c9b4..9617511d97c 100644
--- a/jscomp/test/gpr_1658_test.js
+++ b/jscomp/test/gpr_1658_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1667_test.js b/jscomp/test/gpr_1667_test.js
index b908253946b..53f9750c9b8 100644
--- a/jscomp/test/gpr_1667_test.js
+++ b/jscomp/test/gpr_1667_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1698_test.js b/jscomp/test/gpr_1698_test.js
index 2a0fb865d9c..4c0e82d63e2 100644
--- a/jscomp/test/gpr_1698_test.js
+++ b/jscomp/test/gpr_1698_test.js
@@ -50,14 +50,14 @@ function compare(context, state, _a, _b) {
                 break;
             case "Frac" :
                 throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "gpr_1698_test.res",
-                        41,
-                        9
-                      ],
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: "Assert_failure",
+                  _1: [
+                    "gpr_1698_test.res",
+                    41,
+                    9
+                  ],
+                  Error: new Error()
+                };
             case "Pow" :
             case "Gcd" :
                 exit = 1;
@@ -76,14 +76,14 @@ function compare(context, state, _a, _b) {
           switch (b.TAG) {
             case "Val" :
                 throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "gpr_1698_test.res",
-                        41,
-                        9
-                      ],
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: "Assert_failure",
+                  _1: [
+                    "gpr_1698_test.res",
+                    41,
+                    9
+                  ],
+                  Error: new Error()
+                };
             case "Neg" :
                 exit$3 = 5;
                 break;
diff --git a/jscomp/test/gpr_1701_test.js b/jscomp/test/gpr_1701_test.js
index be682196d66..28680f6b51e 100644
--- a/jscomp/test/gpr_1701_test.js
+++ b/jscomp/test/gpr_1701_test.js
@@ -10,9 +10,9 @@ var Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo");
 function test(n) {
   if (n === 0) {
     throw {
-          RE_EXN_ID: Foo,
-          Error: new Error()
-        };
+      RE_EXN_ID: Foo,
+      Error: new Error()
+    };
   }
   try {
     return test(n - 1 | 0);
@@ -83,9 +83,9 @@ function read_lines3(inc) {
     try {
       var l = input_line(inc);
       return loop({
-                  hd: l,
-                  tl: acc
-                });
+            hd: l,
+            tl: acc
+          });
     }
     catch (raw_exn){
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
diff --git a/jscomp/test/gpr_1716_test.js b/jscomp/test/gpr_1716_test.js
index 4683a97cd3d..6609115ee4a 100644
--- a/jscomp/test/gpr_1716_test.js
+++ b/jscomp/test/gpr_1716_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1728_test.js b/jscomp/test/gpr_1728_test.js
index 6c9472edbd1..9e74e976063 100644
--- a/jscomp/test/gpr_1728_test.js
+++ b/jscomp/test/gpr_1728_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1749_test.js b/jscomp/test/gpr_1749_test.js
index b75c25e9f95..7339ca80afa 100644
--- a/jscomp/test/gpr_1749_test.js
+++ b/jscomp/test/gpr_1749_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1760_test.js b/jscomp/test/gpr_1760_test.js
index 8a701ac9f6e..f71a0f5a5d3 100644
--- a/jscomp/test/gpr_1760_test.js
+++ b/jscomp/test/gpr_1760_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1762_test.js b/jscomp/test/gpr_1762_test.js
index 0fa11d25212..ee69f71d1d5 100644
--- a/jscomp/test/gpr_1762_test.js
+++ b/jscomp/test/gpr_1762_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1817_test.js b/jscomp/test/gpr_1817_test.js
index 16a623257ee..7631b46e004 100644
--- a/jscomp/test/gpr_1817_test.js
+++ b/jscomp/test/gpr_1817_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -33,10 +33,10 @@ function f(param) {
   var x = new Date();
   var y = new Date();
   return [
-          Caml_obj.greaterthan(y, x),
-          Caml_obj.lessthan(y, x),
-          true
-        ];
+    Caml_obj.greaterthan(y, x),
+    Caml_obj.lessthan(y, x),
+    true
+  ];
 }
 
 var match = f();
diff --git a/jscomp/test/gpr_1822_test.js b/jscomp/test/gpr_1822_test.js
index 6776e28a321..358cf5ef375 100644
--- a/jscomp/test/gpr_1822_test.js
+++ b/jscomp/test/gpr_1822_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_1943_test.js b/jscomp/test/gpr_1943_test.js
index ed12bfff36a..39925d9b250 100644
--- a/jscomp/test/gpr_1943_test.js
+++ b/jscomp/test/gpr_1943_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -30,14 +30,14 @@ function eq(loc, x, y) {
 
 function f(x) {
   return [
-          x._003,
-          x._50,
-          x._50x,
-          x.__50,
-          x.__50x,
-          x["_50x'"],
-          x["x'"]
-        ];
+    x._003,
+    x._50,
+    x._50x,
+    x.__50,
+    x.__50x,
+    x["_50x'"],
+    x["x'"]
+  ];
 }
 
 var v = f({
diff --git a/jscomp/test/gpr_1946_test.js b/jscomp/test/gpr_1946_test.js
index 7b1c6c28549..04b2be9dc74 100644
--- a/jscomp/test/gpr_1946_test.js
+++ b/jscomp/test/gpr_1946_test.js
@@ -16,13 +16,13 @@ function eq(loc, x, y) {
 }
 
 var x = ({
-    x: 3,
-    y: 4
-  }).x;
+  x: 3,
+  y: 4
+}).x;
 
 var zz = ({
-    _5: 3
-  })._5;
+  _5: 3
+})._5;
 
 var h = {
   "0123": 2,
@@ -37,8 +37,8 @@ function f(id) {
 }
 
 eq("File \"gpr_1946_test.res\", line 24, characters 3-10", ({
-        _5: 3
-      })._5, 3);
+      _5: 3
+    })._5, 3);
 
 eq("File \"gpr_1946_test.res\", line 25, characters 3-10", [
       2,
@@ -49,8 +49,8 @@ eq("File \"gpr_1946_test.res\", line 25, characters 3-10", [
     ]);
 
 console.log(({
-          _5: 3
-        }).TAG);
+        _5: 3
+      }).TAG);
 
 Mt.from_pair_suites("File \"gpr_1946_test.res\", line 28, characters 20-27", suites.contents);
 
diff --git a/jscomp/test/gpr_2316_test.js b/jscomp/test/gpr_2316_test.js
index ef8b728e78d..c24b83d40f4 100644
--- a/jscomp/test/gpr_2316_test.js
+++ b/jscomp/test/gpr_2316_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -33,10 +33,10 @@ var y;
 
 try {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "boo",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "boo",
+    Error: new Error()
+  };
 }
 catch (raw_msg){
   var msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
@@ -53,10 +53,10 @@ var exit = 0;
 
 try {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "boo",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "boo",
+    Error: new Error()
+  };
 }
 catch (raw_msg$1){
   var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg$1);
diff --git a/jscomp/test/gpr_2682_test.js b/jscomp/test/gpr_2682_test.js
index a1691566078..c66058c9e51 100644
--- a/jscomp/test/gpr_2682_test.js
+++ b/jscomp/test/gpr_2682_test.js
@@ -47,14 +47,14 @@ var bbbb = f3();
 
 if (!bbbb) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_2682_test.res",
-          52,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_2682_test.res",
+      52,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 exports.sum = sum;
diff --git a/jscomp/test/gpr_3546_test.js b/jscomp/test/gpr_3546_test.js
index 5c8420e5428..055024d2604 100644
--- a/jscomp/test/gpr_3546_test.js
+++ b/jscomp/test/gpr_3546_test.js
@@ -4,9 +4,9 @@
 
 function t_error3(param_0) {
   return {
-          TAG: "T_error3",
-          _0: param_0
-        };
+    TAG: "T_error3",
+    _0: param_0
+  };
 }
 
 var t_error = "T_error";
diff --git a/jscomp/test/gpr_3566_test.js b/jscomp/test/gpr_3566_test.js
index c7714376320..893d611bc0d 100644
--- a/jscomp/test/gpr_3566_test.js
+++ b/jscomp/test/gpr_3566_test.js
@@ -25,11 +25,11 @@ function Test($star) {
         _0: 3
       }, u);
   return {
-          u: u,
-          Block: Block,
-          y: 32,
-          b: b
-        };
+    u: u,
+    Block: Block,
+    y: 32,
+    b: b
+  };
 }
 
 function Test2($star) {
@@ -43,10 +43,10 @@ function Test2($star) {
         _0: 3
       });
   return {
-          Block: Block,
-          y: 32,
-          b: b
-        };
+    Block: Block,
+    y: 32,
+    b: b
+  };
 }
 
 function f(i, y) {
@@ -61,18 +61,18 @@ function Test3($star) {
   var f = Caml_obj.equal;
   var Caml_obj$1 = {};
   return {
-          f: f,
-          Caml_obj: Caml_obj$1
-        };
+    f: f,
+    Caml_obj: Caml_obj$1
+  };
 }
 
 function Test4($star) {
   var Caml_obj$1 = {};
   var f = Caml_obj.equal;
   return {
-          Caml_obj: Caml_obj$1,
-          f: f
-        };
+    Caml_obj: Caml_obj$1,
+    f: f
+  };
 }
 
 function Test5($star) {
@@ -81,9 +81,9 @@ function Test5($star) {
   };
   var Caml_option$1 = {};
   return {
-          f: f,
-          Caml_option: Caml_option$1
-        };
+    f: f,
+    Caml_option: Caml_option$1
+  };
 }
 
 function Test6($star) {
@@ -92,16 +92,16 @@ function Test6($star) {
     return Caml_option.some(x);
   };
   return {
-          Caml_option: Caml_option$1,
-          f: f
-        };
+    Caml_option: Caml_option$1,
+    f: f
+  };
 }
 
 function Test7($star) {
   var Caml_option = {};
   return {
-          Caml_option: Caml_option
-        };
+    Caml_option: Caml_option
+  };
 }
 
 function Test8($star) {
@@ -110,9 +110,9 @@ function Test8($star) {
     return Curry._1(x, 1);
   };
   return {
-          Curry: Curry$1,
-          f: f
-        };
+    Curry: Curry$1,
+    f: f
+  };
 }
 
 function Test9($star) {
@@ -121,16 +121,16 @@ function Test9($star) {
   };
   var Curry$1 = {};
   return {
-          f: f,
-          Curry: Curry$1
-        };
+    f: f,
+    Curry: Curry$1
+  };
 }
 
 function Test10($star) {
   var Curry = {};
   return {
-          Curry: Curry
-        };
+    Curry: Curry
+  };
 }
 
 var x = 3;
diff --git a/jscomp/test/gpr_3697_test.js b/jscomp/test/gpr_3697_test.js
index 1b6f27b4baa..80df5b8b797 100644
--- a/jscomp/test/gpr_3697_test.js
+++ b/jscomp/test/gpr_3697_test.js
@@ -5,11 +5,11 @@ var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
 
 function fix(param) {
   return {
-          TAG: "Fix",
-          _0: CamlinternalLazy.from_fun(function () {
-                return fix();
-              })
-        };
+    TAG: "Fix",
+    _0: CamlinternalLazy.from_fun(function () {
+          return fix();
+        })
+  };
 }
 
 function unfixLeak(_f) {
diff --git a/jscomp/test/gpr_3877_test.js b/jscomp/test/gpr_3877_test.js
index 4311dc15eb7..ae93bf14d8c 100644
--- a/jscomp/test/gpr_3877_test.js
+++ b/jscomp/test/gpr_3877_test.js
@@ -22,26 +22,26 @@ var b = "bad response";
 
 if (a !== "good response") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_3877_test.res",
-          26,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_3877_test.res",
+      26,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 if (b !== "bad response") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_3877_test.res",
-          27,
-          0
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_3877_test.res",
+      27,
+      0
+    ],
+    Error: new Error()
+  };
 }
 
 exports.test = test;
diff --git a/jscomp/test/gpr_3980_test.js b/jscomp/test/gpr_3980_test.js
index 478fd21a59c..779dc69aa5d 100644
--- a/jscomp/test/gpr_3980_test.js
+++ b/jscomp/test/gpr_3980_test.js
@@ -8,41 +8,41 @@ var match = 1;
 if (match !== undefined) {
   if (match !== 1) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_3980_test.res",
-            15,
-            7
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "gpr_3980_test.res",
+        15,
+        7
+      ],
+      Error: new Error()
+    };
   }
   var match$1 = 1;
   if (match$1 !== 1) {
     if (match$1 !== 2) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "gpr_3980_test.res",
-              13,
-              9
-            ],
-            Error: new Error()
-          };
-    }
-    Js_math.floor(1);
-  }
-  
-} else {
-  throw {
         RE_EXN_ID: "Assert_failure",
         _1: [
           "gpr_3980_test.res",
-          15,
-          7
+          13,
+          9
         ],
         Error: new Error()
       };
+    }
+    Js_math.floor(1);
+  }
+  
+} else {
+  throw {
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_3980_test.res",
+      15,
+      7
+    ],
+    Error: new Error()
+  };
 }
 
 /*  Not a pure module */
diff --git a/jscomp/test/gpr_4025_test.js b/jscomp/test/gpr_4025_test.js
index c9192742ebd..009ab3fd39c 100644
--- a/jscomp/test/gpr_4025_test.js
+++ b/jscomp/test/gpr_4025_test.js
@@ -8,8 +8,8 @@ console.log("hi");
 
 function f(x) {
   ({
-      x: (console.log("hi"), x)
-    }).x = x + 1 | 0;
+    x: (console.log("hi"), x)
+  }).x = x + 1 | 0;
 }
 
 exports.f = f;
diff --git a/jscomp/test/gpr_405_test.js b/jscomp/test/gpr_405_test.js
index 3deb71c9105..2ddc99bb954 100644
--- a/jscomp/test/gpr_405_test.js
+++ b/jscomp/test/gpr_405_test.js
@@ -38,25 +38,25 @@ function Make(funarg) {
     var step2 = function (top, rest_of_stack) {
       if (find_default(already_processed, top)) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "gpr_405_test.res",
-                40,
-                6
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "gpr_405_test.res",
+            40,
+            6
+          ],
+          Error: new Error()
+        };
       }
       if (find_default(on_the_stack, top)) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "gpr_405_test.res",
-                41,
-                6
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "gpr_405_test.res",
+            41,
+            6
+          ],
+          Error: new Error()
+        };
       }
       Curry._3(H.add, on_the_stack, top, true);
       Curry._3(H.add, n_labels, top, counter.contents);
@@ -74,12 +74,12 @@ function Make(funarg) {
           var successor = successors.hd;
           if (!find_default(already_processed, successor)) {
             return step2(successor, {
-                        hd: [
-                          top$1,
-                          successors
-                        ],
-                        tl: rest_of_stack$1
-                      });
+                  hd: [
+                    top$1,
+                    successors
+                  ],
+                  tl: rest_of_stack$1
+                });
           }
           var x = find_default(on_the_stack, successor) ? Curry._2(H.find, n_labels, successor) : Curry._2(H.find, l_labels, successor);
           Curry._3(H.add, l_labels, top$1, Caml.int_max(Curry._2(H.find, l_labels, top$1), x));
@@ -95,10 +95,10 @@ function Make(funarg) {
         }
         if (Curry._2(H.find, l_labels, top$1) > Curry._2(H.find, n_labels, top$1)) {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Graph.Mincut: graph not reducible",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Graph.Mincut: graph not reducible",
+            Error: new Error()
+          };
         }
         if (!rest_of_stack$1) {
           return cut_set.contents;
@@ -116,8 +116,8 @@ function Make(funarg) {
     return step2(first_node, /* [] */0);
   };
   return {
-          min_cutset: min_cutset
-        };
+    min_cutset: min_cutset
+  };
 }
 
 exports.Make = Make;
diff --git a/jscomp/test/gpr_459_test.js b/jscomp/test/gpr_459_test.js
index 660dd230972..4cd54521cbd 100644
--- a/jscomp/test/gpr_459_test.js
+++ b/jscomp/test/gpr_459_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_4632.js b/jscomp/test/gpr_4632.js
index 47fbae78cae..785f867fdb8 100644
--- a/jscomp/test/gpr_4632.js
+++ b/jscomp/test/gpr_4632.js
@@ -22,14 +22,14 @@ var T0 = {
 };
 
 throw {
-      RE_EXN_ID: "Match_failure",
-      _1: [
-        "gpr_4632.res",
-        12,
-        6
-      ],
-      Error: new Error()
-    };
+  RE_EXN_ID: "Match_failure",
+  _1: [
+    "gpr_4632.res",
+    12,
+    6
+  ],
+  Error: new Error()
+};
 
 exports.T0 = T0;
 exports.T1 = T1;
diff --git a/jscomp/test/gpr_5218_test.js b/jscomp/test/gpr_5218_test.js
index 7b7a0949b72..156aa4b6750 100644
--- a/jscomp/test/gpr_5218_test.js
+++ b/jscomp/test/gpr_5218_test.js
@@ -14,14 +14,14 @@ var suites = {
 function test(x) {
   if (x.NAME === 2) {
     return {
-            NAME: 2,
-            VAL: x.VAL
-          };
+      NAME: 2,
+      VAL: x.VAL
+    };
   } else {
     return {
-            NAME: 1,
-            VAL: x.VAL
-          };
+      NAME: 1,
+      VAL: x.VAL
+    };
   }
 }
 
diff --git a/jscomp/test/gpr_5557.js b/jscomp/test/gpr_5557.js
index e6abeb63e7d..a7ffaaaeba5 100644
--- a/jscomp/test/gpr_5557.js
+++ b/jscomp/test/gpr_5557.js
@@ -7,14 +7,14 @@ function isA(c) {
     return true;
   }
   throw {
-        RE_EXN_ID: "Match_failure",
-        _1: [
-          "gpr_5557.res",
-          5,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Match_failure",
+    _1: [
+      "gpr_5557.res",
+      5,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var h = /* 'a' */97;
diff --git a/jscomp/test/gpr_858_unit2_test.js b/jscomp/test/gpr_858_unit2_test.js
index 98000fc476a..6b00912b8ab 100644
--- a/jscomp/test/gpr_858_unit2_test.js
+++ b/jscomp/test/gpr_858_unit2_test.js
@@ -24,14 +24,14 @@ for(var i = 1; i <= 2; ++i){
       return;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_858_unit2_test.res",
-            6,
-            13
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "gpr_858_unit2_test.res",
+        6,
+        13
+      ],
+      Error: new Error()
+    };
   }
   }(i));
   f(0, i);
diff --git a/jscomp/test/gpr_904_test.js b/jscomp/test/gpr_904_test.js
index 9d9f558358d..04b25559b38 100644
--- a/jscomp/test/gpr_904_test.js
+++ b/jscomp/test/gpr_904_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/gpr_974_test.js b/jscomp/test/gpr_974_test.js
index 43ed9585715..b878e5793db 100644
--- a/jscomp/test/gpr_974_test.js
+++ b/jscomp/test/gpr_974_test.js
@@ -6,38 +6,38 @@ var Caml_option = require("../../lib/js/caml_option.js");
 
 if (!Caml_obj.equal(Caml_option.nullable_to_opt(""), "")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          2,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_974_test.res",
+      2,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Caml_option.undefined_to_opt(""), "")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          3,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_974_test.res",
+      3,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(Caml_option.null_to_opt(""), "")) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          4,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "gpr_974_test.res",
+      4,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 /*  Not a pure module */
diff --git a/jscomp/test/gpr_977_test.js b/jscomp/test/gpr_977_test.js
index 61038541adc..2760f2f24f9 100644
--- a/jscomp/test/gpr_977_test.js
+++ b/jscomp/test/gpr_977_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/guide_for_ext.js b/jscomp/test/guide_for_ext.js
index 66a6db94543..61646a7caa3 100644
--- a/jscomp/test/guide_for_ext.js
+++ b/jscomp/test/guide_for_ext.js
@@ -4,9 +4,9 @@
 
 function mk(param) {
   return {
-          text: 32,
-          label: "hel"
-        };
+    text: 32,
+    label: "hel"
+  };
 }
 
 exports.mk = mk;
diff --git a/jscomp/test/hashtbl_test.js b/jscomp/test/hashtbl_test.js
index afb8268a04c..9827ded0cb8 100644
--- a/jscomp/test/hashtbl_test.js
+++ b/jscomp/test/hashtbl_test.js
@@ -10,14 +10,14 @@ var MoreLabels = require("../../lib/js/moreLabels.js");
 
 function to_list(tbl) {
   return Hashtbl.fold((function (k, v, acc) {
-                return {
-                        hd: [
-                          k,
-                          v
-                        ],
-                        tl: acc
-                      };
-              }), tbl, /* [] */0);
+          return {
+            hd: [
+              k,
+              v
+            ],
+            tl: acc
+          };
+        }), tbl, /* [] */0);
 }
 
 function f(param) {
@@ -25,8 +25,8 @@ function f(param) {
   Hashtbl.add(tbl, 1, /* '1' */49);
   Hashtbl.add(tbl, 2, /* '2' */50);
   return List.sort((function (param, param$1) {
-                return Caml.int_compare(param[0], param$1[0]);
-              }), to_list(tbl));
+          return Caml.int_compare(param[0], param$1[0]);
+        }), to_list(tbl));
 }
 
 function g(count) {
@@ -39,30 +39,30 @@ function g(count) {
   }
   var v = to_list(tbl);
   return $$Array.of_list(List.sort((function (param, param$1) {
-                    return Caml.int_compare(param[0], param$1[0]);
-                  }), v));
+              return Caml.int_compare(param[0], param$1[0]);
+            }), v));
 }
 
 var suites_0 = [
   "simple",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f()
-            };
+        TAG: "Eq",
+        _0: {
+          hd: [
+            1,
+            /* '1' */49
+          ],
+          tl: {
+            hd: [
+              2,
+              /* '2' */50
+            ],
+            tl: /* [] */0
+          }
+        },
+        _1: f()
+      };
     })
 ];
 
@@ -71,15 +71,15 @@ var suites_1 = {
     "more_iterations",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: $$Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(1000)
-              };
+          TAG: "Eq",
+          _0: $$Array.init(1001, (function (i) {
+                  return [
+                    (i << 1),
+                    String(i)
+                  ];
+                })),
+          _1: g(1000)
+        };
       })
   ],
   tl: {
@@ -89,10 +89,10 @@ var suites_1 = {
           var tbl = MoreLabels.Hashtbl.create(undefined, 30);
           Hashtbl.add(tbl, 3, 3);
           return {
-                  TAG: "Eq",
-                  _0: tbl.size,
-                  _1: 1
-                };
+            TAG: "Eq",
+            _0: tbl.size,
+            _1: 1
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/ignore_test.js b/jscomp/test/ignore_test.js
index 6b400bd6cc2..602839e99f4 100644
--- a/jscomp/test/ignore_test.js
+++ b/jscomp/test/ignore_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/imm_map_bench.js b/jscomp/test/imm_map_bench.js
index 3921535bd42..68033d1241f 100644
--- a/jscomp/test/imm_map_bench.js
+++ b/jscomp/test/imm_map_bench.js
@@ -25,9 +25,9 @@ function should(b) {
 
 var shuffledDataAdd = Belt_Array.makeByAndShuffle(1000001, (function (i) {
         return [
-                i,
-                i
-              ];
+          i,
+          i
+        ];
       }));
 
 function test(param) {
diff --git a/jscomp/test/incomplete_toplevel_test.js b/jscomp/test/incomplete_toplevel_test.js
index 701ec21cf27..7797064bc9c 100644
--- a/jscomp/test/incomplete_toplevel_test.js
+++ b/jscomp/test/incomplete_toplevel_test.js
@@ -5,10 +5,10 @@
 function f(param) {
   console.log("no inline");
   return [
-          1,
-          2,
-          3
-        ];
+    1,
+    2,
+    3
+  ];
 }
 
 var match = f();
diff --git a/jscomp/test/inline_map2_test.js b/jscomp/test/inline_map2_test.js
index c30c9631589..5de9b8e1c00 100644
--- a/jscomp/test/inline_map2_test.js
+++ b/jscomp/test/inline_map2_test.js
@@ -19,23 +19,23 @@ function Make(Ord) {
     var hl = height(l);
     var hr = height(r);
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var singleton = function (x, d) {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: d,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: d,
+      _3: "Empty",
+      _4: 1
+    };
   };
   var bal = function (l, x, d, r) {
     var hl;
@@ -45,10 +45,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       }
       var lr = l._3;
       var ld = l._2;
@@ -61,27 +61,27 @@ function Make(Ord) {
         return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              _0: l,
-              _1: x,
-              _2: d,
-              _3: r,
-              _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        _0: l,
+        _1: x,
+        _2: d,
+        _3: r,
+        _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var rr = r._3;
     var rd = r._2;
@@ -94,10 +94,10 @@ function Make(Ord) {
       return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   };
   var is_empty = function (x) {
     if (typeof x !== "object") {
@@ -109,13 +109,13 @@ function Make(Ord) {
   var add = function (x, data, x_) {
     if (typeof x_ !== "object") {
       return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x,
-              _2: data,
-              _3: "Empty",
-              _4: 1
-            };
+        TAG: "Node",
+        _0: "Empty",
+        _1: x,
+        _2: data,
+        _3: "Empty",
+        _4: 1
+      };
     }
     var r = x_._3;
     var d = x_._2;
@@ -124,13 +124,13 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return {
-              TAG: "Node",
-              _0: l,
-              _1: x,
-              _2: data,
-              _3: r,
-              _4: x_._4
-            };
+        TAG: "Node",
+        _0: l,
+        _1: x,
+        _2: data,
+        _3: r,
+        _4: x_._4
+      };
     } else if (c < 0) {
       return bal(add(x, data, l), v, d, r);
     } else {
@@ -142,9 +142,9 @@ function Make(Ord) {
       var x_ = _x_;
       if (typeof x_ !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = Curry._2(Ord.compare, x, x_._1);
       if (c === 0) {
@@ -173,16 +173,16 @@ function Make(Ord) {
       var x = _x;
       if (typeof x !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = x._0;
       if (typeof l !== "object") {
         return [
-                x._1,
-                x._2
-              ];
+          x._1,
+          x._2
+        ];
       }
       _x = l;
       continue ;
@@ -193,16 +193,16 @@ function Make(Ord) {
       var x = _x;
       if (typeof x !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = x._3;
       if (typeof r !== "object") {
         return [
-                x._1,
-                x._2
-              ];
+          x._1,
+          x._2
+        ];
       }
       _x = r;
       continue ;
@@ -211,10 +211,10 @@ function Make(Ord) {
   var remove_min_binding = function (x) {
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = x._0;
     if (typeof l !== "object") {
@@ -267,13 +267,13 @@ function Make(Ord) {
     var d$p = Curry._1(f, x._2);
     var r$p = map(f, x._3);
     return {
-            TAG: "Node",
-            _0: l$p,
-            _1: x._1,
-            _2: d$p,
-            _3: r$p,
-            _4: x._4
-          };
+      TAG: "Node",
+      _0: l$p,
+      _1: x._1,
+      _2: d$p,
+      _3: r$p,
+      _4: x._4
+    };
   };
   var mapi = function (f, x) {
     if (typeof x !== "object") {
@@ -284,13 +284,13 @@ function Make(Ord) {
     var d$p = Curry._2(f, v, x._2);
     var r$p = mapi(f, x._3);
     return {
-            TAG: "Node",
-            _0: l$p,
-            _1: v,
-            _2: d$p,
-            _3: r$p,
-            _4: x._4
-          };
+      TAG: "Node",
+      _0: l$p,
+      _1: v,
+      _2: d$p,
+      _3: r$p,
+      _4: x._4
+    };
   };
   var fold = function (f, _m, _accu) {
     while(true) {
@@ -387,10 +387,10 @@ function Make(Ord) {
   var split = function (x, x_) {
     if (typeof x_ !== "object") {
       return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
+        "Empty",
+        undefined,
+        "Empty"
+      ];
     }
     var r = x_._3;
     var d = x_._2;
@@ -399,25 +399,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
+        l,
+        Caml_option.some(d),
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, d, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, d, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var merge = function (f, s1, s2) {
     if (typeof s1 !== "object") {
@@ -435,14 +435,14 @@ function Make(Ord) {
     }
     if (typeof s2 !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "inline_map2_test.res",
-              359,
-              11
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "inline_map2_test.res",
+          359,
+          11
+        ],
+        Error: new Error()
+      };
     }
     var v2 = s2._1;
     var match$1 = split(v2, s1);
@@ -466,9 +466,9 @@ function Make(Ord) {
   var partition = function (p, x) {
     if (typeof x !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var d = x._2;
     var v = x._1;
@@ -481,14 +481,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pvd) {
       return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, d, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, d, rf)
+      ];
     }
   };
   var cons_enum = function (_m, _e) {
@@ -594,42 +594,42 @@ function Make(Ord) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          height: height,
-          create: create,
-          singleton: singleton,
-          bal: bal,
-          empty: "Empty",
-          is_empty: is_empty,
-          add: add,
-          find: find,
-          mem: mem,
-          min_binding: min_binding,
-          max_binding: max_binding,
-          remove_min_binding: remove_min_binding,
-          remove: remove,
-          iter: iter,
-          map: map,
-          mapi: mapi,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          add_min_binding: add_min_binding,
-          add_max_binding: add_max_binding,
-          join: join,
-          concat: concat,
-          concat_or_join: concat_or_join,
-          split: split,
-          merge: merge,
-          filter: filter,
-          partition: partition,
-          cons_enum: cons_enum,
-          compare: compare,
-          equal: equal,
-          cardinal: cardinal,
-          bindings_aux: bindings_aux,
-          bindings: bindings,
-          choose: min_binding
-        };
+    height: height,
+    create: create,
+    singleton: singleton,
+    bal: bal,
+    empty: "Empty",
+    is_empty: is_empty,
+    add: add,
+    find: find,
+    mem: mem,
+    min_binding: min_binding,
+    max_binding: max_binding,
+    remove_min_binding: remove_min_binding,
+    remove: remove,
+    iter: iter,
+    map: map,
+    mapi: mapi,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    add_min_binding: add_min_binding,
+    add_max_binding: add_max_binding,
+    join: join,
+    concat: concat,
+    concat_or_join: concat_or_join,
+    split: split,
+    merge: merge,
+    filter: filter,
+    partition: partition,
+    cons_enum: cons_enum,
+    compare: compare,
+    equal: equal,
+    cardinal: cardinal,
+    bindings_aux: bindings_aux,
+    bindings: bindings,
+    choose: min_binding
+  };
 }
 
 function height(x) {
@@ -644,24 +644,24 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: d,
-          _3: "Empty",
-          _4: 1
-        };
+    TAG: "Node",
+    _0: "Empty",
+    _1: x,
+    _2: d,
+    _3: "Empty",
+    _4: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -672,10 +672,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l._3;
     var ld = l._2;
@@ -688,27 +688,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r._3;
   var rd = r._2;
@@ -721,10 +721,10 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function is_empty(x) {
@@ -738,13 +738,13 @@ function is_empty(x) {
 function add(x, data, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: data,
+      _3: "Empty",
+      _4: 1
+    };
   }
   var r = x_._3;
   var d = x_._2;
@@ -753,13 +753,13 @@ function add(x, data, x_) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: x_._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, l), v, d, r);
   } else {
@@ -772,9 +772,9 @@ function find(x, _x_) {
     var x_ = _x_;
     if (typeof x_ !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(x, x_._1);
     if (c === 0) {
@@ -805,16 +805,16 @@ function min_binding(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = x._0;
     if (typeof l !== "object") {
       return [
-              x._1,
-              x._2
-            ];
+        x._1,
+        x._2
+      ];
     }
     _x = l;
     continue ;
@@ -826,16 +826,16 @@ function max_binding(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = x._3;
     if (typeof r !== "object") {
       return [
-              x._1,
-              x._2
-            ];
+        x._1,
+        x._2
+      ];
     }
     _x = r;
     continue ;
@@ -845,10 +845,10 @@ function max_binding(_x) {
 function remove_min_binding(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = x._0;
   if (typeof l !== "object") {
@@ -904,13 +904,13 @@ function map(f, x) {
   var d$p = Curry._1(f, x._2);
   var r$p = map(f, x._3);
   return {
-          TAG: "Node",
-          _0: l$p,
-          _1: x._1,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
+    TAG: "Node",
+    _0: l$p,
+    _1: x._1,
+    _2: d$p,
+    _3: r$p,
+    _4: x._4
+  };
 }
 
 function mapi(f, x) {
@@ -922,13 +922,13 @@ function mapi(f, x) {
   var d$p = Curry._2(f, v, x._2);
   var r$p = mapi(f, x._3);
   return {
-          TAG: "Node",
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
+    TAG: "Node",
+    _0: l$p,
+    _1: v,
+    _2: d$p,
+    _3: r$p,
+    _4: x._4
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -1034,10 +1034,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, x_) {
   if (typeof x_ !== "object") {
     return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
+      "Empty",
+      undefined,
+      "Empty"
+    ];
   }
   var r = x_._3;
   var d = x_._2;
@@ -1046,25 +1046,25 @@ function split(x, x_) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, d, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge(f, s1, s2) {
@@ -1083,14 +1083,14 @@ function merge(f, s1, s2) {
   }
   if (typeof s2 !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map2_test.res",
-            359,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "inline_map2_test.res",
+        359,
+        11
+      ],
+      Error: new Error()
+    };
   }
   var v2 = s2._1;
   var match$1 = split(v2, s1);
@@ -1116,9 +1116,9 @@ function filter(p, x) {
 function partition(p, x) {
   if (typeof x !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var d = x._2;
   var v = x._1;
@@ -1131,14 +1131,14 @@ function partition(p, x) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, d, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, d, rf)
+    ];
   }
 }
 
@@ -1328,24 +1328,24 @@ function create$1(l, x, d, r) {
   var hl = height$1(l);
   var hr = height$1(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton$1(x, d) {
   return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: d,
-          _3: "Empty",
-          _4: 1
-        };
+    TAG: "Node",
+    _0: "Empty",
+    _1: x,
+    _2: d,
+    _3: "Empty",
+    _4: 1
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -1356,10 +1356,10 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l._3;
     var ld = l._2;
@@ -1372,27 +1372,27 @@ function bal$1(l, x, d, r) {
       return create$1(create$1(ll, lv, ld, lr._0), lr._1, lr._2, create$1(lr._3, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r._3;
   var rd = r._2;
@@ -1405,10 +1405,10 @@ function bal$1(l, x, d, r) {
     return create$1(create$1(l, x, d, rl._0), rl._1, rl._2, create$1(rl._3, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function is_empty$1(x) {
@@ -1422,13 +1422,13 @@ function is_empty$1(x) {
 function add$1(x, data, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: data,
+      _3: "Empty",
+      _4: 1
+    };
   }
   var r = x_._3;
   var d = x_._2;
@@ -1437,13 +1437,13 @@ function add$1(x, data, x_) {
   var c = Caml.string_compare(x, v);
   if (c === 0) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: x_._4
+    };
   } else if (c < 0) {
     return bal$1(add$1(x, data, l), v, d, r);
   } else {
@@ -1456,9 +1456,9 @@ function find$1(x, _x_) {
     var x_ = _x_;
     if (typeof x_ !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.string_compare(x, x_._1);
     if (c === 0) {
@@ -1489,16 +1489,16 @@ function min_binding$1(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = x._0;
     if (typeof l !== "object") {
       return [
-              x._1,
-              x._2
-            ];
+        x._1,
+        x._2
+      ];
     }
     _x = l;
     continue ;
@@ -1510,16 +1510,16 @@ function max_binding$1(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = x._3;
     if (typeof r !== "object") {
       return [
-              x._1,
-              x._2
-            ];
+        x._1,
+        x._2
+      ];
     }
     _x = r;
     continue ;
@@ -1529,10 +1529,10 @@ function max_binding$1(_x) {
 function remove_min_binding$1(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = x._0;
   if (typeof l !== "object") {
@@ -1588,13 +1588,13 @@ function map$1(f, x) {
   var d$p = Curry._1(f, x._2);
   var r$p = map$1(f, x._3);
   return {
-          TAG: "Node",
-          _0: l$p,
-          _1: x._1,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
+    TAG: "Node",
+    _0: l$p,
+    _1: x._1,
+    _2: d$p,
+    _3: r$p,
+    _4: x._4
+  };
 }
 
 function mapi$1(f, x) {
@@ -1606,13 +1606,13 @@ function mapi$1(f, x) {
   var d$p = Curry._2(f, v, x._2);
   var r$p = mapi$1(f, x._3);
   return {
-          TAG: "Node",
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
+    TAG: "Node",
+    _0: l$p,
+    _1: v,
+    _2: d$p,
+    _3: r$p,
+    _4: x._4
+  };
 }
 
 function fold$1(f, _m, _accu) {
@@ -1718,10 +1718,10 @@ function concat_or_join$1(t1, v, d, t2) {
 function split$1(x, x_) {
   if (typeof x_ !== "object") {
     return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
+      "Empty",
+      undefined,
+      "Empty"
+    ];
   }
   var r = x_._3;
   var d = x_._2;
@@ -1730,25 +1730,25 @@ function split$1(x, x_) {
   var c = Caml.string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     var match = split$1(x, l);
     return [
-            match[0],
-            match[1],
-            join$1(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join$1(match[2], v, d, r)
+    ];
   }
   var match$1 = split$1(x, r);
   return [
-          join$1(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join$1(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge$1(f, s1, s2) {
@@ -1767,14 +1767,14 @@ function merge$1(f, s1, s2) {
   }
   if (typeof s2 !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map2_test.res",
-            359,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "inline_map2_test.res",
+        359,
+        11
+      ],
+      Error: new Error()
+    };
   }
   var v2 = s2._1;
   var match$1 = split$1(v2, s1);
@@ -1800,9 +1800,9 @@ function filter$1(p, x) {
 function partition$1(p, x) {
   if (typeof x !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var d = x._2;
   var v = x._1;
@@ -1815,14 +1815,14 @@ function partition$1(p, x) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join$1(lt, v, d, rt),
-            concat$1(lf, rf)
-          ];
+      join$1(lt, v, d, rt),
+      concat$1(lf, rf)
+    ];
   } else {
     return [
-            concat$1(lt, rt),
-            join$1(lf, v, d, rf)
-          ];
+      concat$1(lt, rt),
+      join$1(lf, v, d, rf)
+    ];
   }
 }
 
@@ -2005,10 +2005,10 @@ Mt.from_pair_suites("Inline_map2_test", {
         "assertion1",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: "Eq",
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: {
@@ -2016,10 +2016,10 @@ Mt.from_pair_suites("Inline_map2_test", {
           "assertion2",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: find$1("10", s),
-                      _1: /* 'a' */97
-                    };
+                TAG: "Eq",
+                _0: find$1("10", s),
+                _1: /* 'a' */97
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/inline_map_demo.js b/jscomp/test/inline_map_demo.js
index c973437e70d..f200cd312b6 100644
--- a/jscomp/test/inline_map_demo.js
+++ b/jscomp/test/inline_map_demo.js
@@ -17,13 +17,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -34,14 +34,14 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "inline_map_demo.res",
-              41,
-              15
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "inline_map_demo.res",
+          41,
+          15
+        ],
+        Error: new Error()
+      };
     }
     var lr = l._3;
     var ld = l._2;
@@ -54,35 +54,35 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map_demo.res",
-            47,
-            19
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "inline_map_demo.res",
+        47,
+        19
+      ],
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map_demo.res",
-            55,
-            15
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "inline_map_demo.res",
+        55,
+        15
+      ],
+      Error: new Error()
+    };
   }
   var rr = r._3;
   var rd = r._2;
@@ -95,26 +95,26 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_map_demo.res",
-          61,
-          19
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "inline_map_demo.res",
+      61,
+      19
+    ],
+    Error: new Error()
+  };
 }
 
 function add(x, data, tree) {
   if (typeof tree !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: data,
+      _3: "Empty",
+      _4: 1
+    };
   }
   var r = tree._3;
   var d = tree._2;
@@ -123,13 +123,13 @@ function add(x, data, tree) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: tree._4
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: tree._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, l), v, d, r);
   } else {
@@ -170,9 +170,9 @@ function find(px, _x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(px, x._1);
     if (c === 0) {
@@ -188,10 +188,10 @@ Mt.from_pair_suites("Inline_map_demo", {
         "find",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: "Eq",
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/inline_map_test.js b/jscomp/test/inline_map_test.js
index 2c55bcd7ad4..7b204b82c32 100644
--- a/jscomp/test/inline_map_test.js
+++ b/jscomp/test/inline_map_test.js
@@ -17,13 +17,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: x,
+    _2: d,
+    _3: r,
+    _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -34,10 +34,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l._3;
     var ld = l._2;
@@ -50,27 +50,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: d,
+      _3: r,
+      _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r._3;
   var rd = r._2;
@@ -83,22 +83,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: data,
+      _3: "Empty",
+      _4: 1
+    };
   }
   var r = x_._3;
   var d = x_._2;
@@ -107,13 +107,13 @@ function add(x, data, x_) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
+      TAG: "Node",
+      _0: l,
+      _1: x,
+      _2: data,
+      _3: r,
+      _4: x_._4
+    };
   } else if (c < 0) {
     return bal(add(x, data, l), v, d, r);
   } else {
@@ -126,9 +126,9 @@ function find(x, _x_) {
     var x_ = _x_;
     if (typeof x_ !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(x, x_._1);
     if (c === 0) {
@@ -172,10 +172,10 @@ Mt.from_pair_suites("Inline_map_test", {
         "find",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: "Eq",
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/inline_record_test.js b/jscomp/test/inline_record_test.js
index 731c0081cf1..ddf7f367773 100644
--- a/jscomp/test/inline_record_test.js
+++ b/jscomp/test/inline_record_test.js
@@ -37,12 +37,12 @@ var v1 = {
 function f(x) {
   if (x.TAG === "A0") {
     return List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), x.lbl, x.more);
+            return prim0 + prim1 | 0;
+          }), x.lbl, x.more);
   } else {
     return List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), 0, x.more);
+            return prim0 + prim1 | 0;
+          }), 0, x.more);
   }
 }
 
@@ -68,14 +68,14 @@ if (A0 === A0) {
   tmp = 3;
 } else {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          47,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "inline_record_test.res",
+      47,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 eq("File \"inline_record_test.res\", line 44, characters 2-9", tmp, 3);
@@ -111,14 +111,14 @@ if (v4.TAG === "A0") {
   tmp$1 = v4.x;
 } else {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          74,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "inline_record_test.res",
+      74,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 eq("File \"inline_record_test.res\", line 71, characters 2-9", tmp$1, 11);
@@ -127,14 +127,14 @@ var tmp$2;
 
 if (v5.TAG === "A0") {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          83,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "inline_record_test.res",
+      83,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 tmp$2 = v5.z;
@@ -169,14 +169,14 @@ if (v6.RE_EXN_ID === A4) {
   tmp$3 = v6.x;
 } else {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          108,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "inline_record_test.res",
+      108,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 eq("File \"inline_record_test.res\", line 105, characters 2-9", tmp$3, 11);
@@ -186,10 +186,10 @@ function ff1(x) {
     return "A1";
   } else {
     return {
-            TAG: "A0",
-            lbl: x.lbl + 1 | 0,
-            more: x.more
-          };
+      TAG: "A0",
+      lbl: x.lbl + 1 | 0,
+      more: x.more
+    };
   }
 }
 
diff --git a/jscomp/test/inline_regression_test.js b/jscomp/test/inline_regression_test.js
index 79e5b6da683..27d9359da8b 100644
--- a/jscomp/test/inline_regression_test.js
+++ b/jscomp/test/inline_regression_test.js
@@ -40,18 +40,18 @@ function generic_basename(is_dir_sep, current_dir_name, name) {
 
 function basename(param) {
   return generic_basename((function (s, i) {
-                return Caml_string.get(s, i) === /* '/' */47;
-              }), Filename.current_dir_name, param);
+          return Caml_string.get(s, i) === /* '/' */47;
+        }), Filename.current_dir_name, param);
 }
 
 var suites_0 = [
   "basename",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: basename("b/c/a.b"),
-              _1: "a.b"
-            };
+        TAG: "Eq",
+        _0: basename("b/c/a.b"),
+        _1: "a.b"
+      };
     })
 ];
 
diff --git a/jscomp/test/inner_call.js b/jscomp/test/inner_call.js
index 27eb2e2b8d4..daf1227fd24 100644
--- a/jscomp/test/inner_call.js
+++ b/jscomp/test/inner_call.js
@@ -7,11 +7,11 @@ console.log(Inner_define.N.add(1, 2));
 
 function f(x) {
   return [
-          Inner_define.N0.f1(x),
-          Inner_define.N0.f2(x, x),
-          Inner_define.N0.f3(x, x, x),
-          Inner_define.N1.f2(x, x)
-        ];
+    Inner_define.N0.f1(x),
+    Inner_define.N0.f2(x, x),
+    Inner_define.N0.f3(x, x, x),
+    Inner_define.N1.f2(x, x)
+  ];
 }
 
 exports.f = f;
diff --git a/jscomp/test/inner_unused.js b/jscomp/test/inner_unused.js
index a76c319ac51..8882d0a42cc 100644
--- a/jscomp/test/inner_unused.js
+++ b/jscomp/test/inner_unused.js
@@ -11,8 +11,8 @@ function M(S) {
     return x;
   };
   return {
-          f: f
-        };
+    f: f
+  };
 }
 
 function fff(param, param$1) {
diff --git a/jscomp/test/installation_test.js b/jscomp/test/installation_test.js
index de7f5028747..758cd600de8 100644
--- a/jscomp/test/installation_test.js
+++ b/jscomp/test/installation_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/int32_test.js b/jscomp/test/int32_test.js
index 7d53b6e881d..c59783fb9ce 100644
--- a/jscomp/test/int32_test.js
+++ b/jscomp/test/int32_test.js
@@ -10,10 +10,10 @@ var Ext_array_test = require("./ext_array_test.js");
 
 function f(x) {
   return [
-          x,
-          (x >>> 1),
-          (x >>> 2)
-        ];
+    x,
+    (x >>> 1),
+    (x >>> 2)
+  ];
 }
 
 var shift_right_logical_tests_0 = $$Array.map((function (x) {
@@ -158,10 +158,10 @@ var suites = {
           "File \"int32_test.res\", line 131, characters 9-16",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 1,
-                      _1: 1
-                    };
+                TAG: "Eq",
+                _0: 1,
+                _1: 1
+              };
             })
         ],
         tl: {
@@ -169,47 +169,47 @@ var suites = {
             "File \"int32_test.res\", line 132, characters 9-16",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: -2147483647,
-                        _1: -2147483647
-                      };
+                  TAG: "Eq",
+                  _0: -2147483647,
+                  _1: -2147483647
+                };
               })
           ],
           tl: /* [] */0
         }
       }, Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                       return [
-                              "shift_right_logical_cases " + i,
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: a,
-                                          _1: b
-                                        };
-                                })
-                            ];
+                        "shift_right_logical_cases " + i,
+                        (function (param) {
+                            return {
+                              TAG: "Eq",
+                              _0: a,
+                              _1: b
+                            };
+                          })
+                      ];
                     }), shift_right_logical_tests_0, shift_right_logical_tests_1)), Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                           return [
-                                  "shift_right_cases " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
+                            "shift_right_cases " + i,
+                            (function (param) {
+                                return {
+                                  TAG: "Eq",
+                                  _0: a,
+                                  _1: b
+                                };
+                              })
+                          ];
                         }), shift_right_tests_0, shift_right_tests_1)), $$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                           return [
-                                  "shift_left_cases " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
+                            "shift_left_cases " + i,
+                            (function (param) {
+                                return {
+                                  TAG: "Eq",
+                                  _0: a,
+                                  _1: b
+                                };
+                              })
+                          ];
                         }), shift_left_tests_0, shift_left_tests_1)))))
 };
 
diff --git a/jscomp/test/int64_mul_div_test.js b/jscomp/test/int64_mul_div_test.js
index cae28749518..749720b846f 100644
--- a/jscomp/test/int64_mul_div_test.js
+++ b/jscomp/test/int64_mul_div_test.js
@@ -10,16 +10,16 @@ var Pervasives = require("../../lib/js/pervasives.js");
 
 function commutative_mul(result, a, b) {
   return {
-          TAG: "Eq",
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.mul(a, b),
-            Caml_int64.mul(b, a)
-          ]
-        };
+    TAG: "Eq",
+    _0: [
+      result,
+      result
+    ],
+    _1: [
+      Caml_int64.mul(a, b),
+      Caml_int64.mul(b, a)
+    ]
+  };
 }
 
 var pairs = [
@@ -307,16 +307,16 @@ var pairs = [
 
 function from_pairs(prefix, pairs) {
   return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[2];
-                    var a = param[1];
-                    var result = param[0];
-                    return [
-                            prefix + "_" + i,
-                            (function (param) {
-                                return commutative_mul(result, a, b);
-                              })
-                          ];
-                  }), pairs));
+              var b = param[2];
+              var a = param[1];
+              var result = param[0];
+              return [
+                prefix + "_" + i,
+                (function (param) {
+                    return commutative_mul(result, a, b);
+                  })
+              ];
+            }), pairs));
 }
 
 var small_pairs = [
@@ -1510,27 +1510,27 @@ var simple_divs = [
 
 function from(xs) {
   return List.mapi((function (i, param) {
-                var d = param[3];
-                var c = param[2];
-                var b = param[1];
-                var a = param[0];
-                return [
-                        "small_divs " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      c,
-                                      d
-                                    ],
-                                    _1: [
-                                      Caml_int64.div(a, b),
-                                      Caml_int64.mod_(a, b)
-                                    ]
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
+          var d = param[3];
+          var c = param[2];
+          var b = param[1];
+          var a = param[0];
+          return [
+            "small_divs " + i,
+            (function (param) {
+                return {
+                  TAG: "Eq",
+                  _0: [
+                    c,
+                    d
+                  ],
+                  _1: [
+                    Caml_int64.div(a, b),
+                    Caml_int64.mod_(a, b)
+                  ]
+                };
+              })
+          ];
+        }), $$Array.to_list(xs));
 }
 
 var to_string = [[
@@ -1567,76 +1567,76 @@ var int64_compare_tests = [
 
 function from_compare(xs) {
   return List.mapi((function (i, param) {
-                var c = param[2];
-                var b = param[1];
-                var a = param[0];
-                return [
-                        "int64_compare " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: c,
-                                    _1: Caml_int64.compare(a, b)
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
+          var c = param[2];
+          var b = param[1];
+          var a = param[0];
+          return [
+            "int64_compare " + i,
+            (function (param) {
+                return {
+                  TAG: "Eq",
+                  _0: c,
+                  _1: Caml_int64.compare(a, b)
+                };
+              })
+          ];
+        }), $$Array.to_list(xs));
 }
 
 function from_to_string(xs) {
   return List.mapi((function (i, param) {
-                var str_a = param[1];
-                var a = param[0];
-                return [
-                        "to_string " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: str_a,
-                                    _1: Caml_int64.to_string(a)
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
+          var str_a = param[1];
+          var a = param[0];
+          return [
+            "to_string " + i,
+            (function (param) {
+                return {
+                  TAG: "Eq",
+                  _0: str_a,
+                  _1: Caml_int64.to_string(a)
+                };
+              })
+          ];
+        }), $$Array.to_list(xs));
 }
 
 Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pairs), Pervasives.$at(from_pairs("small", small_pairs), Pervasives.$at(List.mapi((function (i, param) {
                         var f = param[1];
                         var i64 = param[0];
                         return [
-                                "to_float_" + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: Caml_int64.to_float(i64),
-                                            _1: f
-                                          };
-                                  })
-                              ];
+                          "to_float_" + i,
+                          (function (param) {
+                              return {
+                                TAG: "Eq",
+                                _0: Caml_int64.to_float(i64),
+                                _1: f
+                              };
+                            })
+                        ];
                       }), $$Array.to_list(to_floats)), Pervasives.$at(List.mapi((function (i, param) {
                             var i64 = param[1];
                             var f = param[0];
                             return [
-                                    "of_float_" + i,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_int64.of_float(f),
-                                                _1: i64
-                                              };
-                                      })
-                                  ];
+                              "of_float_" + i,
+                              (function (param) {
+                                  return {
+                                    TAG: "Eq",
+                                    _0: Caml_int64.of_float(f),
+                                    _1: i64
+                                  };
+                                })
+                            ];
                           }), $$Array.to_list(of_float_pairs)), Pervasives.$at({
                           hd: [
                             "compare_check_complete",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: $$Array.map((function (param) {
-                                                return true;
-                                              }), check_complete_compare),
-                                        _1: check_complete_compare
-                                      };
+                                  TAG: "Eq",
+                                  _0: $$Array.map((function (param) {
+                                          return true;
+                                        }), check_complete_compare),
+                                  _1: check_complete_compare
+                                };
                               })
                           ],
                           tl: /* [] */0
@@ -1645,10 +1645,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pa
                                     "div_rem_0",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: Caml_int64.zero,
-                                                _1: Caml_int64.zero
-                                              };
+                                          TAG: "Eq",
+                                          _0: Caml_int64.zero,
+                                          _1: Caml_int64.zero
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -1656,10 +1656,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pa
                                       "div_rem_1",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: Caml_int64.neg_one,
-                                                  _1: Caml_int64.neg_one
-                                                };
+                                            TAG: "Eq",
+                                            _0: Caml_int64.neg_one,
+                                            _1: Caml_int64.neg_one
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -1667,10 +1667,10 @@ Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pa
                                         "File \"int64_mul_div_test.res\", line 263, characters 19-26",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: Caml_int64.to_float(Int64.max_int),
-                                                    _1: 9.22337203685477581e+18
-                                                  };
+                                              TAG: "Eq",
+                                              _0: Caml_int64.to_float(Int64.max_int),
+                                              _1: 9.22337203685477581e+18
+                                            };
                                           })
                                       ],
                                       tl: /* [] */0
diff --git a/jscomp/test/int64_string_test.js b/jscomp/test/int64_string_test.js
index af2ed53ebd5..24ef99e7a89 100644
--- a/jscomp/test/int64_string_test.js
+++ b/jscomp/test/int64_string_test.js
@@ -1308,19 +1308,6 @@ Belt_List.forEach(random_data, (function (u) {
         if (u) {
           if (u.tl) {
             throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "int64_string_test.res",
-                    191,
-                    9
-                  ],
-                  Error: new Error()
-                };
-          }
-          var match = u.hd;
-          return eq("File \"int64_string_test.res\", line 190, characters 25-32", Caml_int64.to_string(match[0]), match[1]);
-        }
-        throw {
               RE_EXN_ID: "Assert_failure",
               _1: [
                 "int64_string_test.res",
@@ -1329,6 +1316,19 @@ Belt_List.forEach(random_data, (function (u) {
               ],
               Error: new Error()
             };
+          }
+          var match = u.hd;
+          return eq("File \"int64_string_test.res\", line 190, characters 25-32", Caml_int64.to_string(match[0]), match[1]);
+        }
+        throw {
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "int64_string_test.res",
+            191,
+            9
+          ],
+          Error: new Error()
+        };
       }));
 
 eq("File \"int64_string_test.res\", line 195, characters 3-10", Caml_int64.to_string([
diff --git a/jscomp/test/int64_test.js b/jscomp/test/int64_test.js
index 790a938ef12..2681b077847 100644
--- a/jscomp/test/int64_test.js
+++ b/jscomp/test/int64_test.js
@@ -21,16 +21,16 @@ var a = [
 
 function commutative_add(result, a, b) {
   return {
-          TAG: "Eq",
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.add(a, b),
-            Caml_int64.add(b, a)
-          ]
-        };
+    TAG: "Eq",
+    _0: [
+      result,
+      result
+    ],
+    _1: [
+      Caml_int64.add(a, b),
+      Caml_int64.add(b, a)
+    ]
+  };
 }
 
 var generic_compare = Caml_obj.compare;
@@ -854,13 +854,13 @@ var suites = Pervasives.$at({
         "add_one",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: [
-                      0,
-                      2147483648
-                    ]
-                  };
+              TAG: "Eq",
+              _0: v,
+              _1: [
+                0,
+                2147483648
+              ]
+            };
           })
       ],
       tl: {
@@ -868,13 +868,13 @@ var suites = Pervasives.$at({
           "add_2",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: [
-                        0,
-                        4294967294
-                      ],
-                      _1: Caml_int64.add(a, a)
-                    };
+                TAG: "Eq",
+                _0: [
+                  0,
+                  4294967294
+                ],
+                _1: Caml_int64.add(a, a)
+              };
             })
         ],
         tl: {
@@ -882,10 +882,10 @@ var suites = Pervasives.$at({
             "add_3",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: Caml_int64.zero,
-                        _1: Caml_int64.zero
-                      };
+                  TAG: "Eq",
+                  _0: Caml_int64.zero,
+                  _1: Caml_int64.zero
+                };
               })
           ],
           tl: {
@@ -893,12 +893,12 @@ var suites = Pervasives.$at({
               "add_4",
               (function (param) {
                   return commutative_add([
-                              -1,
-                              4294967294
-                            ], [
-                              -1,
-                              4294967293
-                            ], Caml_int64.one);
+                        -1,
+                        4294967294
+                      ], [
+                        -1,
+                        4294967293
+                      ], Caml_int64.one);
                 })
             ],
             tl: {
@@ -906,12 +906,12 @@ var suites = Pervasives.$at({
                 "add_5",
                 (function (param) {
                     return commutative_add([
-                                -1,
-                                4294967293
-                              ], [
-                                -1,
-                                4294967293
-                              ], Caml_int64.zero);
+                          -1,
+                          4294967293
+                        ], [
+                          -1,
+                          4294967293
+                        ], Caml_int64.zero);
                   })
               ],
               tl: {
@@ -919,15 +919,15 @@ var suites = Pervasives.$at({
                   "add_6",
                   (function (param) {
                       return commutative_add([
-                                  0,
-                                  4
-                                ], [
-                                  -1,
-                                  4294967293
-                                ], [
-                                  0,
-                                  7
-                                ]);
+                            0,
+                            4
+                          ], [
+                            -1,
+                            4294967293
+                          ], [
+                            0,
+                            7
+                          ]);
                     })
                 ],
                 tl: {
@@ -935,15 +935,15 @@ var suites = Pervasives.$at({
                     "add_7",
                     (function (param) {
                         return commutative_add([
-                                    1,
-                                    0
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ]);
+                              1,
+                              0
+                            ], [
+                              0,
+                              2147483648
+                            ], [
+                              0,
+                              2147483648
+                            ]);
                       })
                   ],
                   tl: {
@@ -951,12 +951,12 @@ var suites = Pervasives.$at({
                       "add_8",
                       (function (param) {
                           return commutative_add([
-                                      1,
-                                      0
-                                    ], [
-                                      0,
-                                      4294967295
-                                    ], Caml_int64.one);
+                                1,
+                                0
+                              ], [
+                                0,
+                                4294967295
+                              ], Caml_int64.one);
                         })
                     ],
                     tl: {
@@ -964,15 +964,15 @@ var suites = Pervasives.$at({
                         "add_9",
                         (function (param) {
                             return commutative_add([
-                                        0,
-                                        4294967295
-                                      ], [
-                                        0,
-                                        2147483648
-                                      ], [
-                                        0,
-                                        2147483647
-                                      ]);
+                                  0,
+                                  4294967295
+                                ], [
+                                  0,
+                                  2147483648
+                                ], [
+                                  0,
+                                  2147483647
+                                ]);
                           })
                       ],
                       tl: {
@@ -980,12 +980,12 @@ var suites = Pervasives.$at({
                           "add_10",
                           (function (param) {
                               return commutative_add([
-                                          0,
-                                          2147483648
-                                        ], [
-                                          0,
-                                          2147483648
-                                        ], Caml_int64.zero);
+                                    0,
+                                    2147483648
+                                  ], [
+                                    0,
+                                    2147483648
+                                  ], Caml_int64.zero);
                             })
                         ],
                         tl: {
@@ -993,12 +993,12 @@ var suites = Pervasives.$at({
                             "add_11",
                             (function (param) {
                                 return commutative_add([
-                                            0,
-                                            4294967295
-                                          ], [
-                                            0,
-                                            4294967295
-                                          ], Caml_int64.zero);
+                                      0,
+                                      4294967295
+                                    ], [
+                                      0,
+                                      4294967295
+                                    ], Caml_int64.zero);
                               })
                           ],
                           tl: {
@@ -1006,13 +1006,13 @@ var suites = Pervasives.$at({
                               "to_int32",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: 3,
-                                          _1: Caml_int64.to_int32([
-                                                0,
-                                                3
-                                              ])
-                                        };
+                                    TAG: "Eq",
+                                    _0: 3,
+                                    _1: Caml_int64.to_int32([
+                                          0,
+                                          3
+                                        ])
+                                  };
                                 })
                             ],
                             tl: {
@@ -1020,13 +1020,13 @@ var suites = Pervasives.$at({
                                 "to_int",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: 3,
-                                            _1: Caml_int64.to_int32([
-                                                  0,
-                                                  3
-                                                ])
-                                          };
+                                      TAG: "Eq",
+                                      _0: 3,
+                                      _1: Caml_int64.to_int32([
+                                            0,
+                                            3
+                                          ])
+                                    };
                                   })
                               ],
                               tl: {
@@ -1034,16 +1034,16 @@ var suites = Pervasives.$at({
                                   "of_int",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: [
-                                                0,
-                                                3
-                                              ],
-                                              _1: [
-                                                0,
-                                                3
-                                              ]
-                                            };
+                                        TAG: "Eq",
+                                        _0: [
+                                          0,
+                                          3
+                                        ],
+                                        _1: [
+                                          0,
+                                          3
+                                        ]
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -1051,16 +1051,16 @@ var suites = Pervasives.$at({
                                     "lognot",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: [
-                                                  -1,
-                                                  4294967293
-                                                ],
-                                                _1: [
-                                                  -1,
-                                                  4294967293
-                                                ]
-                                              };
+                                          TAG: "Eq",
+                                          _0: [
+                                            -1,
+                                            4294967293
+                                          ],
+                                          _1: [
+                                            -1,
+                                            4294967293
+                                          ]
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -1068,16 +1068,16 @@ var suites = Pervasives.$at({
                                       "neg",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: [
-                                                    -1,
-                                                    4294967294
-                                                  ],
-                                                  _1: [
-                                                    -1,
-                                                    4294967294
-                                                  ]
-                                                };
+                                            TAG: "Eq",
+                                            _0: [
+                                              -1,
+                                              4294967294
+                                            ],
+                                            _1: [
+                                              -1,
+                                              4294967294
+                                            ]
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -1085,10 +1085,10 @@ var suites = Pervasives.$at({
                                         "File \"int64_test.res\", line 277, characters 7-14",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: Int64.min_int,
-                                                    _1: Caml_int64.neg(Int64.min_int)
-                                                  };
+                                              TAG: "Eq",
+                                              _0: Int64.min_int,
+                                              _1: Caml_int64.neg(Int64.min_int)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -1096,10 +1096,10 @@ var suites = Pervasives.$at({
                                           "File \"int64_test.res\", line 279, characters 8-15",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: Int64.max_int,
-                                                      _1: Caml_int64.neg(Caml_int64.add(Int64.min_int, Caml_int64.one))
-                                                    };
+                                                TAG: "Eq",
+                                                _0: Int64.max_int,
+                                                _1: Caml_int64.neg(Caml_int64.add(Int64.min_int, Caml_int64.one))
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -1107,16 +1107,16 @@ var suites = Pervasives.$at({
                                             "sub1",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: [
-                                                          0,
-                                                          2
-                                                        ],
-                                                        _1: [
-                                                          0,
-                                                          2
-                                                        ]
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: [
+                                                    0,
+                                                    2
+                                                  ],
+                                                  _1: [
+                                                    0,
+                                                    2
+                                                  ]
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -1124,28 +1124,28 @@ var suites = Pervasives.$at({
                                               "xor1",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            Caml_int64.xor(a, [
-                                                                  0,
-                                                                  4009750271
-                                                                ])
-                                                          ],
-                                                          _1: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            [
-                                                              0,
-                                                              2432700672
-                                                            ]
-                                                          ]
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: [
+                                                      [
+                                                        0,
+                                                        286331153
+                                                      ],
+                                                      Caml_int64.xor(a, [
+                                                            0,
+                                                            4009750271
+                                                          ])
+                                                    ],
+                                                    _1: [
+                                                      [
+                                                        0,
+                                                        286331153
+                                                      ],
+                                                      [
+                                                        0,
+                                                        2432700672
+                                                      ]
+                                                    ]
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -1153,16 +1153,16 @@ var suites = Pervasives.$at({
                                                 "or",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: [
-                                                              0,
-                                                              4294967295
-                                                            ],
-                                                            _1: [
-                                                              0,
-                                                              4294967295
-                                                            ]
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: [
+                                                        0,
+                                                        4294967295
+                                                      ],
+                                                      _1: [
+                                                        0,
+                                                        4294967295
+                                                      ]
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -1170,16 +1170,16 @@ var suites = Pervasives.$at({
                                                   "and",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: [
-                                                                0,
-                                                                4008636142
-                                                              ],
-                                                              _1: [
-                                                                0,
-                                                                4008636142
-                                                              ]
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: [
+                                                          0,
+                                                          4008636142
+                                                        ],
+                                                        _1: [
+                                                          0,
+                                                          4008636142
+                                                        ]
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -1187,528 +1187,528 @@ var suites = Pervasives.$at({
                                                     "lsl",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: $$Array.map((function (x) {
-                                                                        return Caml_int64.lsl_(Caml_int64.one, x);
-                                                                      }), $$Array.init(64, (function (i) {
-                                                                            return i;
-                                                                          }))),
-                                                                _1: [
-                                                                  Caml_int64.one,
-                                                                  [
-                                                                    0,
-                                                                    2
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    32
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    64
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    128
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    256
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    512
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1024
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2048
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4096
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8192
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16384
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    32768
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    65536
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    131072
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    262144
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    524288
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1048576
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2097152
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4194304
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8388608
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16777216
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    33554432
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    67108864
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    134217728
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    268435456
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    536870912
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1073741824
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2147483648
-                                                                  ],
-                                                                  [
-                                                                    1,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    32,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    64,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    128,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    256,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    512,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1024,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2048,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4096,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8192,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16384,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    32768,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    65536,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    131072,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    262144,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    524288,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1048576,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2097152,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4194304,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8388608,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16777216,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    33554432,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    67108864,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    134217728,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    268435456,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    536870912,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1073741824,
-                                                                    0
-                                                                  ],
-                                                                  Caml_int64.min_int
-                                                                ]
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "lsr",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: $$Array.map((function (x) {
-                                                                          return Caml_int64.lsr_(Caml_int64.neg_one, x);
-                                                                        }), $$Array.init(64, (function (i) {
-                                                                              return i;
-                                                                            }))),
-                                                                  _1: [
-                                                                    Caml_int64.neg_one,
-                                                                    Caml_int64.max_int,
-                                                                    [
-                                                                      1073741823,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      536870911,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      268435455,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      134217727,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      67108863,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      33554431,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      16777215,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      8388607,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      4194303,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      2097151,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1048575,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      524287,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      262143,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      131071,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      65535,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      32767,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      16383,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      8191,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      4095,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      2047,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1023,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      511,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      255,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      127,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      63,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      31,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      15,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      7,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      3,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2147483647
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1073741823
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      536870911
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      268435455
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      134217727
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      67108863
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      33554431
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      16777215
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      8388607
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4194303
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2097151
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1048575
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      524287
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      262143
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      131071
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      65535
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      32767
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      16383
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      8191
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4095
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2047
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1023
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      511
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      255
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      127
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      63
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      31
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      15
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      7
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      3
-                                                                    ],
-                                                                    Caml_int64.one
-                                                                  ]
-                                                                };
+                                                          TAG: "Eq",
+                                                          _0: $$Array.map((function (x) {
+                                                                  return Caml_int64.lsl_(Caml_int64.one, x);
+                                                                }), $$Array.init(64, (function (i) {
+                                                                      return i;
+                                                                    }))),
+                                                          _1: [
+                                                            Caml_int64.one,
+                                                            [
+                                                              0,
+                                                              2
+                                                            ],
+                                                            [
+                                                              0,
+                                                              4
+                                                            ],
+                                                            [
+                                                              0,
+                                                              8
+                                                            ],
+                                                            [
+                                                              0,
+                                                              16
+                                                            ],
+                                                            [
+                                                              0,
+                                                              32
+                                                            ],
+                                                            [
+                                                              0,
+                                                              64
+                                                            ],
+                                                            [
+                                                              0,
+                                                              128
+                                                            ],
+                                                            [
+                                                              0,
+                                                              256
+                                                            ],
+                                                            [
+                                                              0,
+                                                              512
+                                                            ],
+                                                            [
+                                                              0,
+                                                              1024
+                                                            ],
+                                                            [
+                                                              0,
+                                                              2048
+                                                            ],
+                                                            [
+                                                              0,
+                                                              4096
+                                                            ],
+                                                            [
+                                                              0,
+                                                              8192
+                                                            ],
+                                                            [
+                                                              0,
+                                                              16384
+                                                            ],
+                                                            [
+                                                              0,
+                                                              32768
+                                                            ],
+                                                            [
+                                                              0,
+                                                              65536
+                                                            ],
+                                                            [
+                                                              0,
+                                                              131072
+                                                            ],
+                                                            [
+                                                              0,
+                                                              262144
+                                                            ],
+                                                            [
+                                                              0,
+                                                              524288
+                                                            ],
+                                                            [
+                                                              0,
+                                                              1048576
+                                                            ],
+                                                            [
+                                                              0,
+                                                              2097152
+                                                            ],
+                                                            [
+                                                              0,
+                                                              4194304
+                                                            ],
+                                                            [
+                                                              0,
+                                                              8388608
+                                                            ],
+                                                            [
+                                                              0,
+                                                              16777216
+                                                            ],
+                                                            [
+                                                              0,
+                                                              33554432
+                                                            ],
+                                                            [
+                                                              0,
+                                                              67108864
+                                                            ],
+                                                            [
+                                                              0,
+                                                              134217728
+                                                            ],
+                                                            [
+                                                              0,
+                                                              268435456
+                                                            ],
+                                                            [
+                                                              0,
+                                                              536870912
+                                                            ],
+                                                            [
+                                                              0,
+                                                              1073741824
+                                                            ],
+                                                            [
+                                                              0,
+                                                              2147483648
+                                                            ],
+                                                            [
+                                                              1,
+                                                              0
+                                                            ],
+                                                            [
+                                                              2,
+                                                              0
+                                                            ],
+                                                            [
+                                                              4,
+                                                              0
+                                                            ],
+                                                            [
+                                                              8,
+                                                              0
+                                                            ],
+                                                            [
+                                                              16,
+                                                              0
+                                                            ],
+                                                            [
+                                                              32,
+                                                              0
+                                                            ],
+                                                            [
+                                                              64,
+                                                              0
+                                                            ],
+                                                            [
+                                                              128,
+                                                              0
+                                                            ],
+                                                            [
+                                                              256,
+                                                              0
+                                                            ],
+                                                            [
+                                                              512,
+                                                              0
+                                                            ],
+                                                            [
+                                                              1024,
+                                                              0
+                                                            ],
+                                                            [
+                                                              2048,
+                                                              0
+                                                            ],
+                                                            [
+                                                              4096,
+                                                              0
+                                                            ],
+                                                            [
+                                                              8192,
+                                                              0
+                                                            ],
+                                                            [
+                                                              16384,
+                                                              0
+                                                            ],
+                                                            [
+                                                              32768,
+                                                              0
+                                                            ],
+                                                            [
+                                                              65536,
+                                                              0
+                                                            ],
+                                                            [
+                                                              131072,
+                                                              0
+                                                            ],
+                                                            [
+                                                              262144,
+                                                              0
+                                                            ],
+                                                            [
+                                                              524288,
+                                                              0
+                                                            ],
+                                                            [
+                                                              1048576,
+                                                              0
+                                                            ],
+                                                            [
+                                                              2097152,
+                                                              0
+                                                            ],
+                                                            [
+                                                              4194304,
+                                                              0
+                                                            ],
+                                                            [
+                                                              8388608,
+                                                              0
+                                                            ],
+                                                            [
+                                                              16777216,
+                                                              0
+                                                            ],
+                                                            [
+                                                              33554432,
+                                                              0
+                                                            ],
+                                                            [
+                                                              67108864,
+                                                              0
+                                                            ],
+                                                            [
+                                                              134217728,
+                                                              0
+                                                            ],
+                                                            [
+                                                              268435456,
+                                                              0
+                                                            ],
+                                                            [
+                                                              536870912,
+                                                              0
+                                                            ],
+                                                            [
+                                                              1073741824,
+                                                              0
+                                                            ],
+                                                            Caml_int64.min_int
+                                                          ]
+                                                        };
+                                                      })
+                                                  ],
+                                                  tl: {
+                                                    hd: [
+                                                      "lsr",
+                                                      (function (param) {
+                                                          return {
+                                                            TAG: "Eq",
+                                                            _0: $$Array.map((function (x) {
+                                                                    return Caml_int64.lsr_(Caml_int64.neg_one, x);
+                                                                  }), $$Array.init(64, (function (i) {
+                                                                        return i;
+                                                                      }))),
+                                                            _1: [
+                                                              Caml_int64.neg_one,
+                                                              Caml_int64.max_int,
+                                                              [
+                                                                1073741823,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                536870911,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                268435455,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                134217727,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                67108863,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                33554431,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                16777215,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                8388607,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                4194303,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                2097151,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                1048575,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                524287,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                262143,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                131071,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                65535,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                32767,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                16383,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                8191,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                4095,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                2047,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                1023,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                511,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                255,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                127,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                63,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                31,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                15,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                7,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                3,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                1,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                0,
+                                                                4294967295
+                                                              ],
+                                                              [
+                                                                0,
+                                                                2147483647
+                                                              ],
+                                                              [
+                                                                0,
+                                                                1073741823
+                                                              ],
+                                                              [
+                                                                0,
+                                                                536870911
+                                                              ],
+                                                              [
+                                                                0,
+                                                                268435455
+                                                              ],
+                                                              [
+                                                                0,
+                                                                134217727
+                                                              ],
+                                                              [
+                                                                0,
+                                                                67108863
+                                                              ],
+                                                              [
+                                                                0,
+                                                                33554431
+                                                              ],
+                                                              [
+                                                                0,
+                                                                16777215
+                                                              ],
+                                                              [
+                                                                0,
+                                                                8388607
+                                                              ],
+                                                              [
+                                                                0,
+                                                                4194303
+                                                              ],
+                                                              [
+                                                                0,
+                                                                2097151
+                                                              ],
+                                                              [
+                                                                0,
+                                                                1048575
+                                                              ],
+                                                              [
+                                                                0,
+                                                                524287
+                                                              ],
+                                                              [
+                                                                0,
+                                                                262143
+                                                              ],
+                                                              [
+                                                                0,
+                                                                131071
+                                                              ],
+                                                              [
+                                                                0,
+                                                                65535
+                                                              ],
+                                                              [
+                                                                0,
+                                                                32767
+                                                              ],
+                                                              [
+                                                                0,
+                                                                16383
+                                                              ],
+                                                              [
+                                                                0,
+                                                                8191
+                                                              ],
+                                                              [
+                                                                0,
+                                                                4095
+                                                              ],
+                                                              [
+                                                                0,
+                                                                2047
+                                                              ],
+                                                              [
+                                                                0,
+                                                                1023
+                                                              ],
+                                                              [
+                                                                0,
+                                                                511
+                                                              ],
+                                                              [
+                                                                0,
+                                                                255
+                                                              ],
+                                                              [
+                                                                0,
+                                                                127
+                                                              ],
+                                                              [
+                                                                0,
+                                                                63
+                                                              ],
+                                                              [
+                                                                0,
+                                                                31
+                                                              ],
+                                                              [
+                                                                0,
+                                                                15
+                                                              ],
+                                                              [
+                                                                0,
+                                                                7
+                                                              ],
+                                                              [
+                                                                0,
+                                                                3
+                                                              ],
+                                                              Caml_int64.one
+                                                            ]
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -1716,79 +1716,79 @@ var suites = Pervasives.$at({
                                                         "asr",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: $$Array.map((function (x) {
-                                                                            return Caml_int64.asr_(Caml_int64.neg_one, x);
-                                                                          }), $$Array.init(64, (function (i) {
-                                                                                return i;
-                                                                              }))),
-                                                                    _1: [
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one
-                                                                    ]
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: $$Array.map((function (x) {
+                                                                      return Caml_int64.asr_(Caml_int64.neg_one, x);
+                                                                    }), $$Array.init(64, (function (i) {
+                                                                          return i;
+                                                                        }))),
+                                                              _1: [
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one,
+                                                                Caml_int64.neg_one
+                                                              ]
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -1796,16 +1796,16 @@ var suites = Pervasives.$at({
                                                           "mul simple",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: [
-                                                                        0,
-                                                                        6
-                                                                      ],
-                                                                      _1: [
-                                                                        0,
-                                                                        6
-                                                                      ]
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: [
+                                                                  0,
+                                                                  6
+                                                                ],
+                                                                _1: [
+                                                                  0,
+                                                                  6
+                                                                ]
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -1813,19 +1813,19 @@ var suites = Pervasives.$at({
                                                             "of_int32",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: $$Array.map(Caml_int64.of_int32, [
-                                                                              0,
-                                                                              -2147483648
-                                                                            ]),
-                                                                        _1: [
-                                                                          Caml_int64.zero,
-                                                                          [
-                                                                            -1,
-                                                                            2147483648
-                                                                          ]
-                                                                        ]
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: $$Array.map(Caml_int64.of_int32, [
+                                                                        0,
+                                                                        -2147483648
+                                                                      ]),
+                                                                  _1: [
+                                                                    Caml_int64.zero,
+                                                                    [
+                                                                      -1,
+                                                                      2147483648
+                                                                    ]
+                                                                  ]
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -1833,16 +1833,16 @@ var suites = Pervasives.$at({
                                                               "of_int32_singleton",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ],
-                                                                          _1: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ]
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: [
+                                                                      -1,
+                                                                      4294967293
+                                                                    ],
+                                                                    _1: [
+                                                                      -1,
+                                                                      4294967293
+                                                                    ]
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -1850,16 +1850,16 @@ var suites = Pervasives.$at({
                                                                 "File \"int64_test.res\", line 526, characters 7-14",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: [
-                                                                              0,
-                                                                              3
-                                                                            ],
-                                                                            _1: [
-                                                                              0,
-                                                                              3
-                                                                            ]
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: [
+                                                                        0,
+                                                                        3
+                                                                      ],
+                                                                      _1: [
+                                                                        0,
+                                                                        3
+                                                                      ]
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -1867,19 +1867,19 @@ var suites = Pervasives.$at({
                                                                   "to_int32",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: $$Array.map(Caml_int64.to_int32, [
-                                                                                    Caml_int64.zero,
-                                                                                    [
-                                                                                      0,
-                                                                                      2147483648
-                                                                                    ]
-                                                                                  ]),
-                                                                              _1: [
+                                                                        TAG: "Eq",
+                                                                        _0: $$Array.map(Caml_int64.to_int32, [
+                                                                              Caml_int64.zero,
+                                                                              [
                                                                                 0,
-                                                                                -2147483648
+                                                                                2147483648
                                                                               ]
-                                                                            };
+                                                                            ]),
+                                                                        _1: [
+                                                                          0,
+                                                                          -2147483648
+                                                                        ]
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -1887,10 +1887,10 @@ var suites = Pervasives.$at({
                                                                     "discard_sign",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: Caml_int64.discard_sign(Caml_int64.neg_one),
-                                                                                _1: Caml_int64.max_int
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: Caml_int64.discard_sign(Caml_int64.neg_one),
+                                                                          _1: Caml_int64.max_int
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -1898,22 +1898,22 @@ var suites = Pervasives.$at({
                                                                       "div_mod",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: Caml_int64.div_mod([
-                                                                                        0,
-                                                                                        7
-                                                                                      ], [
-                                                                                        0,
-                                                                                        3
-                                                                                      ]),
-                                                                                  _1: [
-                                                                                    [
-                                                                                      0,
-                                                                                      2
-                                                                                    ],
-                                                                                    Caml_int64.one
-                                                                                  ]
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: Caml_int64.div_mod([
+                                                                                  0,
+                                                                                  7
+                                                                                ], [
+                                                                                  0,
+                                                                                  3
+                                                                                ]),
+                                                                            _1: [
+                                                                              [
+                                                                                0,
+                                                                                2
+                                                                              ],
+                                                                              Caml_int64.one
+                                                                            ]
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -1921,10 +1921,10 @@ var suites = Pervasives.$at({
                                                                         "to_hex",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: Caml_int64.to_hex(Caml_int64.neg_one),
-                                                                                    _1: "ffffffffffffffff"
-                                                                                  };
+                                                                              TAG: "Eq",
+                                                                              _0: Caml_int64.to_hex(Caml_int64.neg_one),
+                                                                              _1: "ffffffffffffffff"
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -1932,13 +1932,13 @@ var suites = Pervasives.$at({
                                                                           "generic_compare",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: Caml_obj.compare([
-                                                                                            1,
-                                                                                            0
-                                                                                          ], Caml_int64.one) > 0,
-                                                                                      _1: true
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: Caml_obj.compare([
+                                                                                      1,
+                                                                                      0
+                                                                                    ], Caml_int64.one) > 0,
+                                                                                _1: true
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -1946,16 +1946,16 @@ var suites = Pervasives.$at({
                                                                             "test_compier_literal",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ],
-                                                                                        _1: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ]
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: [
+                                                                                    0,
+                                                                                    4294967295
+                                                                                  ],
+                                                                                  _1: [
+                                                                                    0,
+                                                                                    4294967295
+                                                                                  ]
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -1963,13 +1963,13 @@ var suites = Pervasives.$at({
                                                                               "generic_compare2",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: Caml_obj.compare([
-                                                                                                0,
-                                                                                                2147483648
-                                                                                              ], Caml_int64.one) > 0,
-                                                                                          _1: true
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: Caml_obj.compare([
+                                                                                          0,
+                                                                                          2147483648
+                                                                                        ], Caml_int64.one) > 0,
+                                                                                    _1: true
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -1977,16 +1977,16 @@ var suites = Pervasives.$at({
                                                                                 "shift_left",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ]
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: [
+                                                                                        0,
+                                                                                        4294967040
+                                                                                      ],
+                                                                                      _1: [
+                                                                                        0,
+                                                                                        4294967040
+                                                                                      ]
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -1994,16 +1994,16 @@ var suites = Pervasives.$at({
                                                                                   "fib_int64",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: fib(1000, Caml_int64.one, [
-                                                                                                    0,
-                                                                                                    2
-                                                                                                  ]),
-                                                                                              _1: [
-                                                                                                -1990564327,
-                                                                                                2874523960
-                                                                                              ]
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: fib(1000, Caml_int64.one, [
+                                                                                              0,
+                                                                                              2
+                                                                                            ]),
+                                                                                        _1: [
+                                                                                          -1990564327,
+                                                                                          2874523960
+                                                                                        ]
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -2011,13 +2011,13 @@ var suites = Pervasives.$at({
                                                                                     "fac_int64",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: fac(30, Caml_int64.one),
-                                                                                                _1: [
-                                                                                                  -2040662563,
-                                                                                                  1409286144
-                                                                                                ]
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: fac(30, Caml_int64.one),
+                                                                                          _1: [
+                                                                                            -2040662563,
+                                                                                            1409286144
+                                                                                          ]
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -2025,13 +2025,13 @@ var suites = Pervasives.$at({
                                                                                       "File \"int64_test.res\", line 553, characters 8-15",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: Caml_int64.add(Int64.max_int, Int64.max_int),
-                                                                                                  _1: [
-                                                                                                    -1,
-                                                                                                    4294967294
-                                                                                                  ]
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: Caml_int64.add(Int64.max_int, Int64.max_int),
+                                                                                            _1: [
+                                                                                              -1,
+                                                                                              4294967294
+                                                                                            ]
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -2039,10 +2039,10 @@ var suites = Pervasives.$at({
                                                                                         "File \"int64_test.res\", line 563, characters 8-15",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: Caml_int64.add(Int64.min_int, Int64.min_int),
-                                                                                                    _1: Caml_int64.zero
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: Caml_int64.add(Int64.min_int, Int64.min_int),
+                                                                                              _1: Caml_int64.zero
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -2050,10 +2050,10 @@ var suites = Pervasives.$at({
                                                                                           "File \"int64_test.res\", line 573, characters 8-15",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: Caml_int64.neg_one,
-                                                                                                      _1: Caml_int64.neg_one
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: Caml_int64.neg_one,
+                                                                                                _1: Caml_int64.neg_one
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: /* [] */0
@@ -2100,37 +2100,37 @@ var suites = Pervasives.$at({
       }
     }, Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                     return [
-                            "shift_left_cases " + i,
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
+                      "shift_left_cases " + i,
+                      (function (param) {
+                          return {
+                            TAG: "Eq",
+                            _0: a,
+                            _1: b
+                          };
+                        })
+                    ];
                   }), shift_left_tests_0, shift_left_tests_1)), Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                         return [
-                                "shift_right_cases " + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
+                          "shift_right_cases " + i,
+                          (function (param) {
+                              return {
+                                TAG: "Eq",
+                                _0: a,
+                                _1: b
+                              };
+                            })
+                        ];
                       }), shift_right_tests_0, shift_right_tests_1)), $$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
                         return [
-                                "shift_right_logical_cases " + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
+                          "shift_right_logical_cases " + i,
+                          (function (param) {
+                              return {
+                                TAG: "Eq",
+                                _0: a,
+                                _1: b
+                              };
+                            })
+                        ];
                       }), shift_right_logical_suites_0, shift_right_logical_suites_1)))));
 
 var suites$1 = {
diff --git a/jscomp/test/int_hashtbl_test.js b/jscomp/test/int_hashtbl_test.js
index 387d8c48bfc..aa4d2dd1cfc 100644
--- a/jscomp/test/int_hashtbl_test.js
+++ b/jscomp/test/int_hashtbl_test.js
@@ -13,16 +13,16 @@ function f(H) {
   Curry._3(H.add, tbl, 1, /* '1' */49);
   Curry._3(H.add, tbl, 2, /* '2' */50);
   return List.sort((function (param, param$1) {
-                return Caml.int_compare(param[0], param$1[0]);
-              }), Curry._3(H.fold, (function (k, v, acc) {
-                    return {
-                            hd: [
-                              k,
-                              v
-                            ],
-                            tl: acc
-                          };
-                  }), tbl, /* [] */0));
+          return Caml.int_compare(param[0], param$1[0]);
+        }), Curry._3(H.fold, (function (k, v, acc) {
+              return {
+                hd: [
+                  k,
+                  v
+                ],
+                tl: acc
+              };
+            }), tbl, /* [] */0));
 }
 
 function g(H, count) {
@@ -35,16 +35,16 @@ function g(H, count) {
   }
   var v = Curry._3(H.fold, (function (k, v, acc) {
           return {
-                  hd: [
-                    k,
-                    v
-                  ],
-                  tl: acc
-                };
+            hd: [
+              k,
+              v
+            ],
+            tl: acc
+          };
         }), tbl, /* [] */0);
   return $$Array.of_list(List.sort((function (param, param$1) {
-                    return Caml.int_compare(param[0], param$1[0]);
-                  }), v));
+              return Caml.int_compare(param[0], param$1[0]);
+            }), v));
 }
 
 var hash = Hashtbl.hash;
@@ -62,22 +62,22 @@ var suites_0 = [
   "simple",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f(Int_hash)
-            };
+        TAG: "Eq",
+        _0: {
+          hd: [
+            1,
+            /* '1' */49
+          ],
+          tl: {
+            hd: [
+              2,
+              /* '2' */50
+            ],
+            tl: /* [] */0
+          }
+        },
+        _1: f(Int_hash)
+      };
     })
 ];
 
@@ -86,15 +86,15 @@ var suites_1 = {
     "more_iterations",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: $$Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(Int_hash, 1000)
-              };
+          TAG: "Eq",
+          _0: $$Array.init(1001, (function (i) {
+                  return [
+                    (i << 1),
+                    String(i)
+                  ];
+                })),
+          _1: g(Int_hash, 1000)
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js
index f774596cef1..bc5ae5c56af 100644
--- a/jscomp/test/int_map.js
+++ b/jscomp/test/int_map.js
@@ -17,24 +17,24 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    d: d,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -45,10 +45,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -61,27 +61,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -94,10 +94,10 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function is_empty(param) {
@@ -111,13 +111,13 @@ function is_empty(param) {
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -129,13 +129,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -159,9 +159,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(x, param.v);
     if (c === 0) {
@@ -177,9 +177,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -192,9 +192,9 @@ function find_first(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -229,9 +229,9 @@ function find_first_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -254,9 +254,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -269,9 +269,9 @@ function find_last(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -306,9 +306,9 @@ function find_last_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -361,16 +361,16 @@ function min_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -386,9 +386,9 @@ function min_binding_opt(_param) {
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -400,16 +400,16 @@ function max_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -425,9 +425,9 @@ function max_binding_opt(_param) {
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -437,10 +437,10 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -494,13 +494,13 @@ function update(x, f, param) {
     var data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: "Empty",
+        h: 1
+      };
     } else {
       return "Empty";
     }
@@ -520,13 +520,13 @@ function update(x, f, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -566,13 +566,13 @@ function map(f, param) {
   var d$p = Curry._1(f, param.d);
   var r$p = map(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -584,13 +584,13 @@ function mapi(f, param) {
   var d$p = Curry._2(f, v, param.d);
   var r$p = mapi(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -696,10 +696,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
+      "Empty",
+      undefined,
+      "Empty"
+    ];
   }
   var r = param.r;
   var d = param.d;
@@ -708,25 +708,25 @@ function split(x, param) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, d, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge$1(f, s1, s2) {
@@ -745,14 +745,14 @@ function merge$1(f, s1, s2) {
   }
   if (typeof s2 !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "map.res",
+        552,
+        11
+      ],
+      Error: new Error()
+    };
   }
   var v2 = s2.v;
   var match$1 = split(v2, s1);
@@ -817,9 +817,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var d = param.d;
   var v = param.v;
@@ -832,14 +832,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, d, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, d, rf)
+    ];
   }
 }
 
diff --git a/jscomp/test/int_overflow_test.js b/jscomp/test/int_overflow_test.js
index cdf97700837..be0b0dc37d8 100644
--- a/jscomp/test/int_overflow_test.js
+++ b/jscomp/test/int_overflow_test.js
@@ -43,10 +43,10 @@ Mt.from_pair_suites("Int_overflow_test", {
         "plus_overflow",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: (Int32.max_int + 1 | 0) === Int32.min_int
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: (Int32.max_int + 1 | 0) === Int32.min_int
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ Mt.from_pair_suites("Int_overflow_test", {
           "minus_overflow",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: (Int32.min_int - Int32.one | 0) === Int32.max_int
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: (Int32.min_int - Int32.one | 0) === Int32.max_int
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ Mt.from_pair_suites("Int_overflow_test", {
             "flow_again",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 2147483646,
-                        _1: (Int32.max_int + Int32.max_int | 0) + Int32.min_int | 0
-                      };
+                  TAG: "Eq",
+                  _0: 2147483646,
+                  _1: (Int32.max_int + Int32.max_int | 0) + Int32.min_int | 0
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ Mt.from_pair_suites("Int_overflow_test", {
               "flow_again",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: -2,
-                          _1: Int32.max_int + Int32.max_int | 0
-                        };
+                    TAG: "Eq",
+                    _0: -2,
+                    _1: Int32.max_int + Int32.max_int | 0
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                 "hash_test",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: hash_variant("xxyyzzuuxxzzyy00112233"),
-                            _1: 544087776
-                          };
+                      TAG: "Eq",
+                      _0: hash_variant("xxyyzzuuxxzzyy00112233"),
+                      _1: 544087776
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                   "hash_test2",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: hash_variant("xxyyzxzzyy"),
-                              _1: -449896130
-                            };
+                        TAG: "Eq",
+                        _0: hash_variant("xxyyzxzzyy"),
+                        _1: -449896130
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                     "File \"int_overflow_test.res\", line 88, characters 5-12",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: hash_variant2("xxyyzzuuxxzzyy00112233"),
-                                _1: 544087776
-                              };
+                          TAG: "Eq",
+                          _0: hash_variant2("xxyyzzuuxxzzyy00112233"),
+                          _1: 544087776
+                        };
                       })
                   ],
                   tl: {
@@ -120,10 +120,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                       "File \"int_overflow_test.res\", line 89, characters 5-12",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: hash_variant2("xxyyzxzzyy"),
-                                  _1: -449896130
-                                };
+                            TAG: "Eq",
+                            _0: hash_variant2("xxyyzxzzyy"),
+                            _1: -449896130
+                          };
                         })
                     ],
                     tl: {
@@ -131,10 +131,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                         "int_literal_flow",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: -1,
-                                    _1: -1
-                                  };
+                              TAG: "Eq",
+                              _0: -1,
+                              _1: -1
+                            };
                           })
                       ],
                       tl: {
@@ -142,10 +142,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                           "int_literal_flow2",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: -1,
-                                      _1: -1
-                                    };
+                                TAG: "Eq",
+                                _0: -1,
+                                _1: -1
+                              };
                             })
                         ],
                         tl: {
@@ -153,10 +153,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                             "int_literal_flow3",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: -1,
-                                        _1: -1
-                                      };
+                                  TAG: "Eq",
+                                  _0: -1,
+                                  _1: -1
+                                };
                               })
                           ],
                           tl: {
@@ -164,10 +164,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                               "int32_mul",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: -33554431,
-                                          _1: -33554431
-                                        };
+                                    TAG: "Eq",
+                                    _0: -33554431,
+                                    _1: -33554431
+                                  };
                                 })
                             ],
                             tl: {
@@ -175,10 +175,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                                 "File \"int_overflow_test.res\", line 94, characters 5-12",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: Number("3") | 0,
-                                            _1: 3
-                                          };
+                                      TAG: "Eq",
+                                      _0: Number("3") | 0,
+                                      _1: 3
+                                    };
                                   })
                               ],
                               tl: {
@@ -186,10 +186,10 @@ Mt.from_pair_suites("Int_overflow_test", {
                                   "File \"int_overflow_test.res\", line 96, characters 5-12",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: Number("3.2") | 0,
-                                              _1: 3
-                                            };
+                                        TAG: "Eq",
+                                        _0: Number("3.2") | 0,
+                                        _1: 3
+                                      };
                                     })
                                 ],
                                 tl: /* [] */0
diff --git a/jscomp/test/internal_unused_test.js b/jscomp/test/internal_unused_test.js
index 9eb9f5af33d..215542834a2 100644
--- a/jscomp/test/internal_unused_test.js
+++ b/jscomp/test/internal_unused_test.js
@@ -9,9 +9,9 @@ var A = /* @__PURE__ */Caml_exceptions.create("Internal_unused_test.P1.A");
 
 function f(param) {
   throw {
-        RE_EXN_ID: A,
-        Error: new Error()
-      };
+    RE_EXN_ID: A,
+    Error: new Error()
+  };
 }
 
 var c = 5;
diff --git a/jscomp/test/js_array_test.js b/jscomp/test/js_array_test.js
index 2cf826a0ff8..3ae7c9b99c9 100644
--- a/jscomp/test/js_array_test.js
+++ b/jscomp/test/js_array_test.js
@@ -16,15 +16,15 @@ var suites_0 = [
         5
       ];
       return {
-              TAG: "Eq",
-              _0: [
-                2,
-                4
-              ],
-              _1: (Js_vector.filterInPlace((function (x) {
-                        return x % 2 === 0;
-                      }), x), x)
-            };
+        TAG: "Eq",
+        _0: [
+          2,
+          4
+        ],
+        _1: (Js_vector.filterInPlace((function (x) {
+                  return x % 2 === 0;
+                }), x), x)
+      };
     })
 ];
 
@@ -40,12 +40,12 @@ var suites_1 = {
           5
         ];
         return {
-                TAG: "Eq",
-                _0: true,
-                _1: (Js_vector.filterInPlace((function (x) {
-                          return x > 10;
-                        }), x), x.length === 0)
-              };
+          TAG: "Eq",
+          _0: true,
+          _1: (Js_vector.filterInPlace((function (x) {
+                    return x > 10;
+                  }), x), x.length === 0)
+        };
       })
   ],
   tl: {
@@ -53,10 +53,10 @@ var suites_1 = {
       "isArray_array",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: Array.isArray([])
-                };
+            TAG: "Eq",
+            _0: true,
+            _1: Array.isArray([])
+          };
         })
     ],
     tl: {
@@ -64,10 +64,10 @@ var suites_1 = {
         "isArray_int",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: Array.isArray(34)
-                  };
+              TAG: "Eq",
+              _0: false,
+              _1: Array.isArray(34)
+            };
           })
       ],
       tl: {
@@ -75,14 +75,14 @@ var suites_1 = {
           "length",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: [
-                        1,
-                        2,
-                        3
-                      ].length
-                    };
+                TAG: "Eq",
+                _0: 3,
+                _1: [
+                  1,
+                  2,
+                  3
+                ].length
+              };
             })
         ],
         tl: {
@@ -90,22 +90,22 @@ var suites_1 = {
             "copyWithin",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: [
-                          1,
-                          2,
-                          3,
-                          1,
-                          2
-                        ],
-                        _1: [
-                            1,
-                            2,
-                            3,
-                            4,
-                            5
-                          ].copyWithin(-2)
-                      };
+                  TAG: "Eq",
+                  _0: [
+                    1,
+                    2,
+                    3,
+                    1,
+                    2
+                  ],
+                  _1: [
+                      1,
+                      2,
+                      3,
+                      4,
+                      5
+                    ].copyWithin(-2)
+                };
               })
           ],
           tl: {
@@ -113,22 +113,22 @@ var suites_1 = {
               "copyWithinFrom",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: [
-                            4,
-                            5,
-                            3,
-                            4,
-                            5
-                          ],
-                          _1: [
-                              1,
-                              2,
-                              3,
-                              4,
-                              5
-                            ].copyWithin(0, 3)
-                        };
+                    TAG: "Eq",
+                    _0: [
+                      4,
+                      5,
+                      3,
+                      4,
+                      5
+                    ],
+                    _1: [
+                        1,
+                        2,
+                        3,
+                        4,
+                        5
+                      ].copyWithin(0, 3)
+                  };
                 })
             ],
             tl: {
@@ -136,22 +136,22 @@ var suites_1 = {
                 "copyWithinFromRange",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: [
-                              4,
-                              2,
-                              3,
-                              4,
-                              5
-                            ],
-                            _1: [
-                                1,
-                                2,
-                                3,
-                                4,
-                                5
-                              ].copyWithin(0, 3, 4)
-                          };
+                      TAG: "Eq",
+                      _0: [
+                        4,
+                        2,
+                        3,
+                        4,
+                        5
+                      ],
+                      _1: [
+                          1,
+                          2,
+                          3,
+                          4,
+                          5
+                        ].copyWithin(0, 3, 4)
+                    };
                   })
               ],
               tl: {
@@ -159,18 +159,18 @@ var suites_1 = {
                   "fillInPlace",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: [
-                                4,
-                                4,
-                                4
-                              ],
-                              _1: [
-                                  1,
-                                  2,
-                                  3
-                                ].fill(4)
-                            };
+                        TAG: "Eq",
+                        _0: [
+                          4,
+                          4,
+                          4
+                        ],
+                        _1: [
+                            1,
+                            2,
+                            3
+                          ].fill(4)
+                      };
                     })
                 ],
                 tl: {
@@ -178,18 +178,18 @@ var suites_1 = {
                     "fillFromInPlace",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: [
-                                  1,
-                                  4,
-                                  4
-                                ],
-                                _1: [
-                                    1,
-                                    2,
-                                    3
-                                  ].fill(4, 1)
-                              };
+                          TAG: "Eq",
+                          _0: [
+                            1,
+                            4,
+                            4
+                          ],
+                          _1: [
+                              1,
+                              2,
+                              3
+                            ].fill(4, 1)
+                        };
                       })
                   ],
                   tl: {
@@ -197,18 +197,18 @@ var suites_1 = {
                       "fillRangeInPlace",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: [
-                                    1,
-                                    4,
-                                    3
-                                  ],
-                                  _1: [
-                                      1,
-                                      2,
-                                      3
-                                    ].fill(4, 1, 2)
-                                };
+                            TAG: "Eq",
+                            _0: [
+                              1,
+                              4,
+                              3
+                            ],
+                            _1: [
+                                1,
+                                2,
+                                3
+                              ].fill(4, 1, 2)
+                          };
                         })
                     ],
                     tl: {
@@ -216,14 +216,14 @@ var suites_1 = {
                         "pop",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: 3,
-                                    _1: Caml_option.undefined_to_opt([
-                                            1,
-                                            2,
-                                            3
-                                          ].pop())
-                                  };
+                              TAG: "Eq",
+                              _0: 3,
+                              _1: Caml_option.undefined_to_opt([
+                                      1,
+                                      2,
+                                      3
+                                    ].pop())
+                            };
                           })
                       ],
                       tl: {
@@ -231,10 +231,10 @@ var suites_1 = {
                           "pop - empty array",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: undefined,
-                                      _1: Caml_option.undefined_to_opt([].pop())
-                                    };
+                                TAG: "Eq",
+                                _0: undefined,
+                                _1: Caml_option.undefined_to_opt([].pop())
+                              };
                             })
                         ],
                         tl: {
@@ -242,14 +242,14 @@ var suites_1 = {
                             "push",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: 4,
-                                        _1: [
-                                            1,
-                                            2,
-                                            3
-                                          ].push(4)
-                                      };
+                                  TAG: "Eq",
+                                  _0: 4,
+                                  _1: [
+                                      1,
+                                      2,
+                                      3
+                                    ].push(4)
+                                };
                               })
                           ],
                           tl: {
@@ -257,14 +257,14 @@ var suites_1 = {
                               "pushMany",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: 5,
-                                          _1: [
-                                              1,
-                                              2,
-                                              3
-                                            ].push(4, 5)
-                                        };
+                                    TAG: "Eq",
+                                    _0: 5,
+                                    _1: [
+                                        1,
+                                        2,
+                                        3
+                                      ].push(4, 5)
+                                  };
                                 })
                             ],
                             tl: {
@@ -272,18 +272,18 @@ var suites_1 = {
                                 "reverseInPlace",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: [
-                                              3,
-                                              2,
-                                              1
-                                            ],
-                                            _1: [
-                                                1,
-                                                2,
-                                                3
-                                              ].reverse()
-                                          };
+                                      TAG: "Eq",
+                                      _0: [
+                                        3,
+                                        2,
+                                        1
+                                      ],
+                                      _1: [
+                                          1,
+                                          2,
+                                          3
+                                        ].reverse()
+                                    };
                                   })
                               ],
                               tl: {
@@ -291,14 +291,14 @@ var suites_1 = {
                                   "shift",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: 1,
-                                              _1: Caml_option.undefined_to_opt([
-                                                      1,
-                                                      2,
-                                                      3
-                                                    ].shift())
-                                            };
+                                        TAG: "Eq",
+                                        _0: 1,
+                                        _1: Caml_option.undefined_to_opt([
+                                                1,
+                                                2,
+                                                3
+                                              ].shift())
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -306,10 +306,10 @@ var suites_1 = {
                                     "shift - empty array",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: undefined,
-                                                _1: Caml_option.undefined_to_opt([].shift())
-                                              };
+                                          TAG: "Eq",
+                                          _0: undefined,
+                                          _1: Caml_option.undefined_to_opt([].shift())
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -317,18 +317,18 @@ var suites_1 = {
                                       "sortInPlace",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: [
-                                                    1,
-                                                    2,
-                                                    3
-                                                  ],
-                                                  _1: [
-                                                      3,
-                                                      1,
-                                                      2
-                                                    ].sort()
-                                                };
+                                            TAG: "Eq",
+                                            _0: [
+                                              1,
+                                              2,
+                                              3
+                                            ],
+                                            _1: [
+                                                3,
+                                                1,
+                                                2
+                                              ].sort()
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -336,20 +336,20 @@ var suites_1 = {
                                         "sortInPlaceWith",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: [
-                                                      3,
-                                                      2,
-                                                      1
-                                                    ],
-                                                    _1: [
-                                                        3,
-                                                        1,
-                                                        2
-                                                      ].sort(function (a, b) {
-                                                          return b - a | 0;
-                                                        })
-                                                  };
+                                              TAG: "Eq",
+                                              _0: [
+                                                3,
+                                                2,
+                                                1
+                                              ],
+                                              _1: [
+                                                  3,
+                                                  1,
+                                                  2
+                                                ].sort(function (a, b) {
+                                                    return b - a | 0;
+                                                  })
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -364,22 +364,22 @@ var suites_1 = {
                                               ];
                                               var removed = arr.splice(2, 0, 5);
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: [
-                                                        [
-                                                          1,
-                                                          2,
-                                                          5,
-                                                          3,
-                                                          4
-                                                        ],
-                                                        []
-                                                      ],
-                                                      _1: [
-                                                        arr,
-                                                        removed
-                                                      ]
-                                                    };
+                                                TAG: "Eq",
+                                                _0: [
+                                                  [
+                                                    1,
+                                                    2,
+                                                    5,
+                                                    3,
+                                                    4
+                                                  ],
+                                                  []
+                                                ],
+                                                _1: [
+                                                  arr,
+                                                  removed
+                                                ]
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -394,22 +394,22 @@ var suites_1 = {
                                                 ];
                                                 var removed = arr.splice(2);
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: [
-                                                          [
-                                                            1,
-                                                            2
-                                                          ],
-                                                          [
-                                                            3,
-                                                            4
-                                                          ]
-                                                        ],
-                                                        _1: [
-                                                          arr,
-                                                          removed
-                                                        ]
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: [
+                                                    [
+                                                      1,
+                                                      2
+                                                    ],
+                                                    [
+                                                      3,
+                                                      4
+                                                    ]
+                                                  ],
+                                                  _1: [
+                                                    arr,
+                                                    removed
+                                                  ]
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -424,20 +424,20 @@ var suites_1 = {
                                                   ];
                                                   var removed = arr.splice(2, 1);
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            [
-                                                              1,
-                                                              2,
-                                                              4
-                                                            ],
-                                                            [3]
-                                                          ],
-                                                          _1: [
-                                                            arr,
-                                                            removed
-                                                          ]
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: [
+                                                      [
+                                                        1,
+                                                        2,
+                                                        4
+                                                      ],
+                                                      [3]
+                                                    ],
+                                                    _1: [
+                                                      arr,
+                                                      removed
+                                                    ]
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -445,14 +445,14 @@ var suites_1 = {
                                                 "unshift",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: 4,
-                                                            _1: [
-                                                                1,
-                                                                2,
-                                                                3
-                                                              ].unshift(4)
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: 4,
+                                                      _1: [
+                                                          1,
+                                                          2,
+                                                          3
+                                                        ].unshift(4)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -460,14 +460,14 @@ var suites_1 = {
                                                   "unshiftMany",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: 5,
-                                                              _1: [
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ].unshift(4, 5)
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: 5,
+                                                        _1: [
+                                                            1,
+                                                            2,
+                                                            3
+                                                          ].unshift(4, 5)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -475,19 +475,19 @@ var suites_1 = {
                                                     "append",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: [
-                                                                  1,
-                                                                  2,
-                                                                  3,
-                                                                  4
-                                                                ],
-                                                                _1: [
-                                                                    1,
-                                                                    2,
-                                                                    3
-                                                                  ].concat([4])
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: [
+                                                            1,
+                                                            2,
+                                                            3,
+                                                            4
+                                                          ],
+                                                          _1: [
+                                                              1,
+                                                              2,
+                                                              3
+                                                            ].concat([4])
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -495,23 +495,23 @@ var suites_1 = {
                                                       "concat",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: [
-                                                                    1,
-                                                                    2,
-                                                                    3,
-                                                                    4,
-                                                                    5
-                                                                  ],
-                                                                  _1: [
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ].concat([
-                                                                        4,
-                                                                        5
-                                                                      ])
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: [
+                                                              1,
+                                                              2,
+                                                              3,
+                                                              4,
+                                                              5
+                                                            ],
+                                                            _1: [
+                                                                1,
+                                                                2,
+                                                                3
+                                                              ].concat([
+                                                                  4,
+                                                                  5
+                                                                ])
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -519,28 +519,28 @@ var suites_1 = {
                                                         "concatMany",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: [
-                                                                      1,
-                                                                      2,
-                                                                      3,
-                                                                      4,
-                                                                      5,
-                                                                      6,
-                                                                      7
-                                                                    ],
-                                                                    _1: [
-                                                                        1,
-                                                                        2,
-                                                                        3
-                                                                      ].concat([
-                                                                          4,
-                                                                          5
-                                                                        ], [
-                                                                          6,
-                                                                          7
-                                                                        ])
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: [
+                                                                1,
+                                                                2,
+                                                                3,
+                                                                4,
+                                                                5,
+                                                                6,
+                                                                7
+                                                              ],
+                                                              _1: [
+                                                                  1,
+                                                                  2,
+                                                                  3
+                                                                ].concat([
+                                                                    4,
+                                                                    5
+                                                                  ], [
+                                                                    6,
+                                                                    7
+                                                                  ])
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -548,14 +548,14 @@ var suites_1 = {
                                                           "includes",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: true,
-                                                                      _1: [
-                                                                          1,
-                                                                          2,
-                                                                          3
-                                                                        ].includes(3)
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: true,
+                                                                _1: [
+                                                                    1,
+                                                                    2,
+                                                                    3
+                                                                  ].includes(3)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -563,14 +563,14 @@ var suites_1 = {
                                                             "indexOf",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: 1,
-                                                                        _1: [
-                                                                            1,
-                                                                            2,
-                                                                            3
-                                                                          ].indexOf(2)
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: 1,
+                                                                  _1: [
+                                                                      1,
+                                                                      2,
+                                                                      3
+                                                                    ].indexOf(2)
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -578,15 +578,15 @@ var suites_1 = {
                                                               "indexOfFrom",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: 3,
-                                                                          _1: [
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              2
-                                                                            ].indexOf(2, 2)
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: 3,
+                                                                    _1: [
+                                                                        1,
+                                                                        2,
+                                                                        3,
+                                                                        2
+                                                                      ].indexOf(2, 2)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -594,14 +594,14 @@ var suites_1 = {
                                                                 "join",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: "1,2,3",
-                                                                            _1: [
-                                                                                1,
-                                                                                2,
-                                                                                3
-                                                                              ].join()
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: "1,2,3",
+                                                                      _1: [
+                                                                          1,
+                                                                          2,
+                                                                          3
+                                                                        ].join()
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -609,14 +609,14 @@ var suites_1 = {
                                                                   "joinWith",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: "1;2;3",
-                                                                              _1: [
-                                                                                  1,
-                                                                                  2,
-                                                                                  3
-                                                                                ].join(";")
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: "1;2;3",
+                                                                        _1: [
+                                                                            1,
+                                                                            2,
+                                                                            3
+                                                                          ].join(";")
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -624,14 +624,14 @@ var suites_1 = {
                                                                     "lastIndexOf",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: 1,
-                                                                                _1: [
-                                                                                    1,
-                                                                                    2,
-                                                                                    3
-                                                                                  ].lastIndexOf(2)
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: 1,
+                                                                          _1: [
+                                                                              1,
+                                                                              2,
+                                                                              3
+                                                                            ].lastIndexOf(2)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -639,15 +639,15 @@ var suites_1 = {
                                                                       "lastIndexOfFrom",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 1,
-                                                                                  _1: [
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      2
-                                                                                    ].lastIndexOf(2, 2)
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: 1,
+                                                                            _1: [
+                                                                                1,
+                                                                                2,
+                                                                                3,
+                                                                                2
+                                                                              ].lastIndexOf(2, 2)
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -655,19 +655,19 @@ var suites_1 = {
                                                                         "slice",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: [
-                                                                                      2,
-                                                                                      3
-                                                                                    ],
-                                                                                    _1: [
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ].slice(1, 3)
-                                                                                  };
+                                                                              TAG: "Eq",
+                                                                              _0: [
+                                                                                2,
+                                                                                3
+                                                                              ],
+                                                                              _1: [
+                                                                                  1,
+                                                                                  2,
+                                                                                  3,
+                                                                                  4,
+                                                                                  5
+                                                                                ].slice(1, 3)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -675,22 +675,22 @@ var suites_1 = {
                                                                           "copy",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: [
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ],
-                                                                                      _1: [
-                                                                                          1,
-                                                                                          2,
-                                                                                          3,
-                                                                                          4,
-                                                                                          5
-                                                                                        ].slice()
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: [
+                                                                                  1,
+                                                                                  2,
+                                                                                  3,
+                                                                                  4,
+                                                                                  5
+                                                                                ],
+                                                                                _1: [
+                                                                                    1,
+                                                                                    2,
+                                                                                    3,
+                                                                                    4,
+                                                                                    5
+                                                                                  ].slice()
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -698,20 +698,20 @@ var suites_1 = {
                                                                             "sliceFrom",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          3,
-                                                                                          4,
-                                                                                          5
-                                                                                        ],
-                                                                                        _1: [
-                                                                                            1,
-                                                                                            2,
-                                                                                            3,
-                                                                                            4,
-                                                                                            5
-                                                                                          ].slice(2)
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: [
+                                                                                    3,
+                                                                                    4,
+                                                                                    5
+                                                                                  ],
+                                                                                  _1: [
+                                                                                      1,
+                                                                                      2,
+                                                                                      3,
+                                                                                      4,
+                                                                                      5
+                                                                                    ].slice(2)
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -719,14 +719,14 @@ var suites_1 = {
                                                                               "toString",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: "1,2,3",
-                                                                                          _1: [
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ].toString()
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: "1,2,3",
+                                                                                    _1: [
+                                                                                        1,
+                                                                                        2,
+                                                                                        3
+                                                                                      ].toString()
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -734,14 +734,14 @@ var suites_1 = {
                                                                                 "toLocaleString",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: "1,2,3",
-                                                                                            _1: [
-                                                                                                1,
-                                                                                                2,
-                                                                                                3
-                                                                                              ].toLocaleString()
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: "1,2,3",
+                                                                                      _1: [
+                                                                                          1,
+                                                                                          2,
+                                                                                          3
+                                                                                        ].toLocaleString()
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -749,16 +749,16 @@ var suites_1 = {
                                                                                   "every",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: true,
-                                                                                              _1: [
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3
-                                                                                                ].every(function (n) {
-                                                                                                    return n > 0;
-                                                                                                  })
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: true,
+                                                                                        _1: [
+                                                                                            1,
+                                                                                            2,
+                                                                                            3
+                                                                                          ].every(function (n) {
+                                                                                              return n > 0;
+                                                                                            })
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -766,16 +766,16 @@ var suites_1 = {
                                                                                     "everyi",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: false,
-                                                                                                _1: [
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3
-                                                                                                  ].every(function (param, i) {
-                                                                                                      return i > 0;
-                                                                                                    })
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: false,
+                                                                                          _1: [
+                                                                                              1,
+                                                                                              2,
+                                                                                              3
+                                                                                            ].every(function (param, i) {
+                                                                                                return i > 0;
+                                                                                              })
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -783,20 +783,20 @@ var suites_1 = {
                                                                                       "filter",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: [
-                                                                                                    2,
-                                                                                                    4
-                                                                                                  ],
-                                                                                                  _1: [
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3,
-                                                                                                      4
-                                                                                                    ].filter(function (n) {
-                                                                                                        return n % 2 === 0;
-                                                                                                      })
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: [
+                                                                                              2,
+                                                                                              4
+                                                                                            ],
+                                                                                            _1: [
+                                                                                                1,
+                                                                                                2,
+                                                                                                3,
+                                                                                                4
+                                                                                              ].filter(function (n) {
+                                                                                                  return n % 2 === 0;
+                                                                                                })
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -804,20 +804,20 @@ var suites_1 = {
                                                                                         "filteri",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: [
-                                                                                                      1,
-                                                                                                      3
-                                                                                                    ],
-                                                                                                    _1: [
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3,
-                                                                                                        4
-                                                                                                      ].filter(function (param, i) {
-                                                                                                          return i % 2 === 0;
-                                                                                                        })
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: [
+                                                                                                1,
+                                                                                                3
+                                                                                              ],
+                                                                                              _1: [
+                                                                                                  1,
+                                                                                                  2,
+                                                                                                  3,
+                                                                                                  4
+                                                                                                ].filter(function (param, i) {
+                                                                                                    return i % 2 === 0;
+                                                                                                  })
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -825,17 +825,17 @@ var suites_1 = {
                                                                                           "find",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: 2,
-                                                                                                      _1: Caml_option.undefined_to_opt([
-                                                                                                              1,
-                                                                                                              2,
-                                                                                                              3,
-                                                                                                              4
-                                                                                                            ].find(function (n) {
-                                                                                                                return n % 2 === 0;
-                                                                                                              }))
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: 2,
+                                                                                                _1: Caml_option.undefined_to_opt([
+                                                                                                        1,
+                                                                                                        2,
+                                                                                                        3,
+                                                                                                        4
+                                                                                                      ].find(function (n) {
+                                                                                                          return n % 2 === 0;
+                                                                                                        }))
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -843,17 +843,17 @@ var suites_1 = {
                                                                                             "find - no match",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: undefined,
-                                                                                                        _1: Caml_option.undefined_to_opt([
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3,
-                                                                                                                4
-                                                                                                              ].find(function (n) {
-                                                                                                                  return n % 2 === 5;
-                                                                                                                }))
-                                                                                                      };
+                                                                                                  TAG: "Eq",
+                                                                                                  _0: undefined,
+                                                                                                  _1: Caml_option.undefined_to_opt([
+                                                                                                          1,
+                                                                                                          2,
+                                                                                                          3,
+                                                                                                          4
+                                                                                                        ].find(function (n) {
+                                                                                                            return n % 2 === 5;
+                                                                                                          }))
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -861,17 +861,17 @@ var suites_1 = {
                                                                                               "findi",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 1,
-                                                                                                          _1: Caml_option.undefined_to_opt([
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ].find(function (param, i) {
-                                                                                                                    return i % 2 === 0;
-                                                                                                                  }))
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: 1,
+                                                                                                    _1: Caml_option.undefined_to_opt([
+                                                                                                            1,
+                                                                                                            2,
+                                                                                                            3,
+                                                                                                            4
+                                                                                                          ].find(function (param, i) {
+                                                                                                              return i % 2 === 0;
+                                                                                                            }))
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -879,17 +879,17 @@ var suites_1 = {
                                                                                                 "findi - no match",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: undefined,
-                                                                                                            _1: Caml_option.undefined_to_opt([
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ].find(function (param, i) {
-                                                                                                                      return i % 2 === 5;
-                                                                                                                    }))
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: undefined,
+                                                                                                      _1: Caml_option.undefined_to_opt([
+                                                                                                              1,
+                                                                                                              2,
+                                                                                                              3,
+                                                                                                              4
+                                                                                                            ].find(function (param, i) {
+                                                                                                                return i % 2 === 5;
+                                                                                                              }))
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -897,17 +897,17 @@ var suites_1 = {
                                                                                                   "findIndex",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: 1,
-                                                                                                              _1: [
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ].findIndex(function (n) {
-                                                                                                                    return n % 2 === 0;
-                                                                                                                  })
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: 1,
+                                                                                                        _1: [
+                                                                                                            1,
+                                                                                                            2,
+                                                                                                            3,
+                                                                                                            4
+                                                                                                          ].findIndex(function (n) {
+                                                                                                              return n % 2 === 0;
+                                                                                                            })
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -915,17 +915,17 @@ var suites_1 = {
                                                                                                     "findIndexi",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: 0,
-                                                                                                                _1: [
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ].findIndex(function (param, i) {
-                                                                                                                      return i % 2 === 0;
-                                                                                                                    })
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: 0,
+                                                                                                          _1: [
+                                                                                                              1,
+                                                                                                              2,
+                                                                                                              3,
+                                                                                                              4
+                                                                                                            ].findIndex(function (param, i) {
+                                                                                                                return i % 2 === 0;
+                                                                                                              })
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -943,10 +943,10 @@ var suites_1 = {
                                                                                                                 sum.contents = sum.contents + n | 0;
                                                                                                               });
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: 6,
-                                                                                                                  _1: sum.contents
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: 6,
+                                                                                                            _1: sum.contents
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -964,10 +964,10 @@ var suites_1 = {
                                                                                                                   sum.contents = sum.contents + i | 0;
                                                                                                                 });
                                                                                                             return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: 3,
-                                                                                                                    _1: sum.contents
-                                                                                                                  };
+                                                                                                              TAG: "Eq",
+                                                                                                              _0: 3,
+                                                                                                              _1: sum.contents
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -975,22 +975,22 @@ var suites_1 = {
                                                                                                           "map",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: [
-                                                                                                                        2,
-                                                                                                                        4,
-                                                                                                                        6,
-                                                                                                                        8
-                                                                                                                      ],
-                                                                                                                      _1: [
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ].map(function (n) {
-                                                                                                                            return (n << 1);
-                                                                                                                          })
-                                                                                                                    };
+                                                                                                                TAG: "Eq",
+                                                                                                                _0: [
+                                                                                                                  2,
+                                                                                                                  4,
+                                                                                                                  6,
+                                                                                                                  8
+                                                                                                                ],
+                                                                                                                _1: [
+                                                                                                                    1,
+                                                                                                                    2,
+                                                                                                                    3,
+                                                                                                                    4
+                                                                                                                  ].map(function (n) {
+                                                                                                                      return (n << 1);
+                                                                                                                    })
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -998,22 +998,22 @@ var suites_1 = {
                                                                                                             "map",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: [
-                                                                                                                          0,
-                                                                                                                          2,
-                                                                                                                          4,
-                                                                                                                          6
-                                                                                                                        ],
-                                                                                                                        _1: [
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ].map(function (param, i) {
-                                                                                                                              return (i << 1);
-                                                                                                                            })
-                                                                                                                      };
+                                                                                                                  TAG: "Eq",
+                                                                                                                  _0: [
+                                                                                                                    0,
+                                                                                                                    2,
+                                                                                                                    4,
+                                                                                                                    6
+                                                                                                                  ],
+                                                                                                                  _1: [
+                                                                                                                      1,
+                                                                                                                      2,
+                                                                                                                      3,
+                                                                                                                      4
+                                                                                                                    ].map(function (param, i) {
+                                                                                                                        return (i << 1);
+                                                                                                                      })
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -1021,17 +1021,17 @@ var suites_1 = {
                                                                                                               "reduce",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: -10,
-                                                                                                                          _1: [
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ].reduce((function (acc, n) {
-                                                                                                                                  return acc - n | 0;
-                                                                                                                                }), 0)
-                                                                                                                        };
+                                                                                                                    TAG: "Eq",
+                                                                                                                    _0: -10,
+                                                                                                                    _1: [
+                                                                                                                        1,
+                                                                                                                        2,
+                                                                                                                        3,
+                                                                                                                        4
+                                                                                                                      ].reduce((function (acc, n) {
+                                                                                                                            return acc - n | 0;
+                                                                                                                          }), 0)
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -1039,17 +1039,17 @@ var suites_1 = {
                                                                                                                 "reducei",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: -6,
-                                                                                                                            _1: [
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3,
-                                                                                                                                4
-                                                                                                                              ].reduce((function (acc, param, i) {
-                                                                                                                                    return acc - i | 0;
-                                                                                                                                  }), 0)
-                                                                                                                          };
+                                                                                                                      TAG: "Eq",
+                                                                                                                      _0: -6,
+                                                                                                                      _1: [
+                                                                                                                          1,
+                                                                                                                          2,
+                                                                                                                          3,
+                                                                                                                          4
+                                                                                                                        ].reduce((function (acc, param, i) {
+                                                                                                                              return acc - i | 0;
+                                                                                                                            }), 0)
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -1057,17 +1057,17 @@ var suites_1 = {
                                                                                                                   "reduceRight",
                                                                                                                   (function (param) {
                                                                                                                       return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: -10,
-                                                                                                                              _1: [
-                                                                                                                                  1,
-                                                                                                                                  2,
-                                                                                                                                  3,
-                                                                                                                                  4
-                                                                                                                                ].reduceRight((function (acc, n) {
-                                                                                                                                      return acc - n | 0;
-                                                                                                                                    }), 0)
-                                                                                                                            };
+                                                                                                                        TAG: "Eq",
+                                                                                                                        _0: -10,
+                                                                                                                        _1: [
+                                                                                                                            1,
+                                                                                                                            2,
+                                                                                                                            3,
+                                                                                                                            4
+                                                                                                                          ].reduceRight((function (acc, n) {
+                                                                                                                                return acc - n | 0;
+                                                                                                                              }), 0)
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -1075,17 +1075,17 @@ var suites_1 = {
                                                                                                                     "reduceRighti",
                                                                                                                     (function (param) {
                                                                                                                         return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: -6,
-                                                                                                                                _1: [
-                                                                                                                                    1,
-                                                                                                                                    2,
-                                                                                                                                    3,
-                                                                                                                                    4
-                                                                                                                                  ].reduceRight((function (acc, param, i) {
-                                                                                                                                        return acc - i | 0;
-                                                                                                                                      }), 0)
-                                                                                                                              };
+                                                                                                                          TAG: "Eq",
+                                                                                                                          _0: -6,
+                                                                                                                          _1: [
+                                                                                                                              1,
+                                                                                                                              2,
+                                                                                                                              3,
+                                                                                                                              4
+                                                                                                                            ].reduceRight((function (acc, param, i) {
+                                                                                                                                  return acc - i | 0;
+                                                                                                                                }), 0)
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: {
@@ -1093,17 +1093,17 @@ var suites_1 = {
                                                                                                                       "some",
                                                                                                                       (function (param) {
                                                                                                                           return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: false,
-                                                                                                                                  _1: [
-                                                                                                                                      1,
-                                                                                                                                      2,
-                                                                                                                                      3,
-                                                                                                                                      4
-                                                                                                                                    ].some(function (n) {
-                                                                                                                                        return n <= 0;
-                                                                                                                                      })
-                                                                                                                                };
+                                                                                                                            TAG: "Eq",
+                                                                                                                            _0: false,
+                                                                                                                            _1: [
+                                                                                                                                1,
+                                                                                                                                2,
+                                                                                                                                3,
+                                                                                                                                4
+                                                                                                                              ].some(function (n) {
+                                                                                                                                  return n <= 0;
+                                                                                                                                })
+                                                                                                                          };
                                                                                                                         })
                                                                                                                     ],
                                                                                                                     tl: {
@@ -1111,17 +1111,17 @@ var suites_1 = {
                                                                                                                         "somei",
                                                                                                                         (function (param) {
                                                                                                                             return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: true,
-                                                                                                                                    _1: [
-                                                                                                                                        1,
-                                                                                                                                        2,
-                                                                                                                                        3,
-                                                                                                                                        4
-                                                                                                                                      ].some(function (param, i) {
-                                                                                                                                          return i <= 0;
-                                                                                                                                        })
-                                                                                                                                  };
+                                                                                                                              TAG: "Eq",
+                                                                                                                              _0: true,
+                                                                                                                              _1: [
+                                                                                                                                  1,
+                                                                                                                                  2,
+                                                                                                                                  3,
+                                                                                                                                  4
+                                                                                                                                ].some(function (param, i) {
+                                                                                                                                    return i <= 0;
+                                                                                                                                  })
+                                                                                                                            };
                                                                                                                           })
                                                                                                                       ],
                                                                                                                       tl: /* [] */0
diff --git a/jscomp/test/js_bool_test.js b/jscomp/test/js_bool_test.js
index 38ac995ae2c..5afc6af95aa 100644
--- a/jscomp/test/js_bool_test.js
+++ b/jscomp/test/js_bool_test.js
@@ -35,10 +35,10 @@ var suites_0 = [
   "?bool_eq_caml_bool",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: u,
-              _1: true
-            };
+        TAG: "Eq",
+        _0: u,
+        _1: true
+      };
     })
 ];
 
@@ -47,10 +47,10 @@ var suites_1 = {
     "js_bool_eq_js_bool",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: v,
-                _1: true
-              };
+          TAG: "Eq",
+          _0: v,
+          _1: true
+        };
       })
   ],
   tl: {
@@ -58,10 +58,10 @@ var suites_1 = {
       "js_bool_neq_acml_bool",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: true === true
-                };
+            TAG: "Eq",
+            _0: true,
+            _1: true === true
+          };
         })
     ],
     tl: /* [] */0
@@ -103,15 +103,15 @@ function ss(x) {
 
 function bb(x) {
   return [
-          true > x,
-          false,
-          true,
-          true <= x,
-          false,
-          false < x,
-          false >= x,
-          true
-        ];
+    true > x,
+    false,
+    true,
+    true <= x,
+    false,
+    false < x,
+    false >= x,
+    true
+  ];
 }
 
 var consts = [
diff --git a/jscomp/test/js_cast_test.js b/jscomp/test/js_cast_test.js
index 16044bcad64..0381b7f2a3d 100644
--- a/jscomp/test/js_cast_test.js
+++ b/jscomp/test/js_cast_test.js
@@ -26,10 +26,10 @@ function add_test(loc, test) {
 function eq(loc, x, y) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         }));
 }
 
diff --git a/jscomp/test/js_date_test.js b/jscomp/test/js_date_test.js
index 60245bb47cf..c706003c879 100644
--- a/jscomp/test/js_date_test.js
+++ b/jscomp/test/js_date_test.js
@@ -12,10 +12,10 @@ var suites_0 = [
   "valueOf",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 195131516789,
-              _1: new Date("1976-03-08T12:34:56.789+01:23").valueOf()
-            };
+        TAG: "Eq",
+        _0: 195131516789,
+        _1: new Date("1976-03-08T12:34:56.789+01:23").valueOf()
+      };
     })
 ];
 
@@ -24,9 +24,9 @@ var suites_1 = {
     "make",
     (function (param) {
         return {
-                TAG: "Ok",
-                _0: new Date().getTime() > 1487223505382
-              };
+          TAG: "Ok",
+          _0: new Date().getTime() > 1487223505382
+        };
       })
   ],
   tl: {
@@ -34,10 +34,10 @@ var suites_1 = {
       "parseAsFloat",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: Date.parse("1976-03-08T12:34:56.789+01:23"),
-                  _1: 195131516789
-                };
+            TAG: "Eq",
+            _0: Date.parse("1976-03-08T12:34:56.789+01:23"),
+            _1: 195131516789
+          };
         })
     ],
     tl: {
@@ -45,9 +45,9 @@ var suites_1 = {
         "parseAsFloat_invalid",
         (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: Number.isNaN(Date.parse("gibberish"))
-                  };
+              TAG: "Ok",
+              _0: Number.isNaN(Date.parse("gibberish"))
+            };
           })
       ],
       tl: {
@@ -55,10 +55,10 @@ var suites_1 = {
           "fromFloat",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: "1976-03-08T11:11:56.789Z",
-                      _1: new Date(195131516789).toISOString()
-                    };
+                TAG: "Eq",
+                _0: "1976-03-08T11:11:56.789Z",
+                _1: new Date(195131516789).toISOString()
+              };
             })
         ],
         tl: {
@@ -66,10 +66,10 @@ var suites_1 = {
             "fromString_valid",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 195131516789,
-                        _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                      };
+                  TAG: "Eq",
+                  _0: 195131516789,
+                  _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
+                };
               })
           ],
           tl: {
@@ -77,9 +77,9 @@ var suites_1 = {
               "fromString_invalid",
               (function (param) {
                   return {
-                          TAG: "Ok",
-                          _0: Number.isNaN(new Date("gibberish").getTime())
-                        };
+                    TAG: "Ok",
+                    _0: Number.isNaN(new Date("gibberish").getTime())
+                  };
                 })
             ],
             tl: {
@@ -88,16 +88,16 @@ var suites_1 = {
                 (function (param) {
                     var d = new Date(1984, 4);
                     return {
-                            TAG: "Eq",
-                            _0: [
-                              1984,
-                              4
-                            ],
-                            _1: [
-                              d.getFullYear(),
-                              d.getMonth()
-                            ]
-                          };
+                      TAG: "Eq",
+                      _0: [
+                        1984,
+                        4
+                      ],
+                      _1: [
+                        d.getFullYear(),
+                        d.getMonth()
+                      ]
+                    };
                   })
               ],
               tl: {
@@ -106,18 +106,18 @@ var suites_1 = {
                   (function (param) {
                       var d = new Date(1984, 4, 6);
                       return {
-                              TAG: "Eq",
-                              _0: [
-                                1984,
-                                4,
-                                6
-                              ],
-                              _1: [
-                                d.getFullYear(),
-                                d.getMonth(),
-                                d.getDate()
-                              ]
-                            };
+                        TAG: "Eq",
+                        _0: [
+                          1984,
+                          4,
+                          6
+                        ],
+                        _1: [
+                          d.getFullYear(),
+                          d.getMonth(),
+                          d.getDate()
+                        ]
+                      };
                     })
                 ],
                 tl: {
@@ -126,20 +126,20 @@ var suites_1 = {
                     (function (param) {
                         var d = new Date(1984, 4, 6, 3);
                         return {
-                                TAG: "Eq",
-                                _0: [
-                                  1984,
-                                  4,
-                                  6,
-                                  3
-                                ],
-                                _1: [
-                                  d.getFullYear(),
-                                  d.getMonth(),
-                                  d.getDate(),
-                                  d.getHours()
-                                ]
-                              };
+                          TAG: "Eq",
+                          _0: [
+                            1984,
+                            4,
+                            6,
+                            3
+                          ],
+                          _1: [
+                            d.getFullYear(),
+                            d.getMonth(),
+                            d.getDate(),
+                            d.getHours()
+                          ]
+                        };
                       })
                   ],
                   tl: {
@@ -148,22 +148,22 @@ var suites_1 = {
                       (function (param) {
                           var d = new Date(1984, 4, 6, 3, 59);
                           return {
-                                  TAG: "Eq",
-                                  _0: [
-                                    1984,
-                                    4,
-                                    6,
-                                    3,
-                                    59
-                                  ],
-                                  _1: [
-                                    d.getFullYear(),
-                                    d.getMonth(),
-                                    d.getDate(),
-                                    d.getHours(),
-                                    d.getMinutes()
-                                  ]
-                                };
+                            TAG: "Eq",
+                            _0: [
+                              1984,
+                              4,
+                              6,
+                              3,
+                              59
+                            ],
+                            _1: [
+                              d.getFullYear(),
+                              d.getMonth(),
+                              d.getDate(),
+                              d.getHours(),
+                              d.getMinutes()
+                            ]
+                          };
                         })
                     ],
                     tl: {
@@ -172,24 +172,24 @@ var suites_1 = {
                         (function (param) {
                             var d = new Date(1984, 4, 6, 3, 59, 27);
                             return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      1984,
-                                      4,
-                                      6,
-                                      3,
-                                      59,
-                                      27
-                                    ],
-                                    _1: [
-                                      d.getFullYear(),
-                                      d.getMonth(),
-                                      d.getDate(),
-                                      d.getHours(),
-                                      d.getMinutes(),
-                                      d.getSeconds()
-                                    ]
-                                  };
+                              TAG: "Eq",
+                              _0: [
+                                1984,
+                                4,
+                                6,
+                                3,
+                                59,
+                                27
+                              ],
+                              _1: [
+                                d.getFullYear(),
+                                d.getMonth(),
+                                d.getDate(),
+                                d.getHours(),
+                                d.getMinutes(),
+                                d.getSeconds()
+                              ]
+                            };
                           })
                       ],
                       tl: {
@@ -199,16 +199,16 @@ var suites_1 = {
                               var d = Date.UTC(1984, 4);
                               var d$1 = new Date(d);
                               return {
-                                      TAG: "Eq",
-                                      _0: [
-                                        1984,
-                                        4
-                                      ],
-                                      _1: [
-                                        d$1.getUTCFullYear(),
-                                        d$1.getUTCMonth()
-                                      ]
-                                    };
+                                TAG: "Eq",
+                                _0: [
+                                  1984,
+                                  4
+                                ],
+                                _1: [
+                                  d$1.getUTCFullYear(),
+                                  d$1.getUTCMonth()
+                                ]
+                              };
                             })
                         ],
                         tl: {
@@ -218,18 +218,18 @@ var suites_1 = {
                                 var d = Date.UTC(1984, 4, 6);
                                 var d$1 = new Date(d);
                                 return {
-                                        TAG: "Eq",
-                                        _0: [
-                                          1984,
-                                          4,
-                                          6
-                                        ],
-                                        _1: [
-                                          d$1.getUTCFullYear(),
-                                          d$1.getUTCMonth(),
-                                          d$1.getUTCDate()
-                                        ]
-                                      };
+                                  TAG: "Eq",
+                                  _0: [
+                                    1984,
+                                    4,
+                                    6
+                                  ],
+                                  _1: [
+                                    d$1.getUTCFullYear(),
+                                    d$1.getUTCMonth(),
+                                    d$1.getUTCDate()
+                                  ]
+                                };
                               })
                           ],
                           tl: {
@@ -239,20 +239,20 @@ var suites_1 = {
                                   var d = Date.UTC(1984, 4, 6, 3);
                                   var d$1 = new Date(d);
                                   return {
-                                          TAG: "Eq",
-                                          _0: [
-                                            1984,
-                                            4,
-                                            6,
-                                            3
-                                          ],
-                                          _1: [
-                                            d$1.getUTCFullYear(),
-                                            d$1.getUTCMonth(),
-                                            d$1.getUTCDate(),
-                                            d$1.getUTCHours()
-                                          ]
-                                        };
+                                    TAG: "Eq",
+                                    _0: [
+                                      1984,
+                                      4,
+                                      6,
+                                      3
+                                    ],
+                                    _1: [
+                                      d$1.getUTCFullYear(),
+                                      d$1.getUTCMonth(),
+                                      d$1.getUTCDate(),
+                                      d$1.getUTCHours()
+                                    ]
+                                  };
                                 })
                             ],
                             tl: {
@@ -262,22 +262,22 @@ var suites_1 = {
                                     var d = Date.UTC(1984, 4, 6, 3, 59);
                                     var d$1 = new Date(d);
                                     return {
-                                            TAG: "Eq",
-                                            _0: [
-                                              1984,
-                                              4,
-                                              6,
-                                              3,
-                                              59
-                                            ],
-                                            _1: [
-                                              d$1.getUTCFullYear(),
-                                              d$1.getUTCMonth(),
-                                              d$1.getUTCDate(),
-                                              d$1.getUTCHours(),
-                                              d$1.getUTCMinutes()
-                                            ]
-                                          };
+                                      TAG: "Eq",
+                                      _0: [
+                                        1984,
+                                        4,
+                                        6,
+                                        3,
+                                        59
+                                      ],
+                                      _1: [
+                                        d$1.getUTCFullYear(),
+                                        d$1.getUTCMonth(),
+                                        d$1.getUTCDate(),
+                                        d$1.getUTCHours(),
+                                        d$1.getUTCMinutes()
+                                      ]
+                                    };
                                   })
                               ],
                               tl: {
@@ -287,24 +287,24 @@ var suites_1 = {
                                       var d = Date.UTC(1984, 4, 6, 3, 59, 27);
                                       var d$1 = new Date(d);
                                       return {
-                                              TAG: "Eq",
-                                              _0: [
-                                                1984,
-                                                4,
-                                                6,
-                                                3,
-                                                59,
-                                                27
-                                              ],
-                                              _1: [
-                                                d$1.getUTCFullYear(),
-                                                d$1.getUTCMonth(),
-                                                d$1.getUTCDate(),
-                                                d$1.getUTCHours(),
-                                                d$1.getUTCMinutes(),
-                                                d$1.getUTCSeconds()
-                                              ]
-                                            };
+                                        TAG: "Eq",
+                                        _0: [
+                                          1984,
+                                          4,
+                                          6,
+                                          3,
+                                          59,
+                                          27
+                                        ],
+                                        _1: [
+                                          d$1.getUTCFullYear(),
+                                          d$1.getUTCMonth(),
+                                          d$1.getUTCDate(),
+                                          d$1.getUTCHours(),
+                                          d$1.getUTCMinutes(),
+                                          d$1.getUTCSeconds()
+                                        ]
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -312,10 +312,10 @@ var suites_1 = {
                                     "getFullYear",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: 1976,
-                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                              };
+                                          TAG: "Eq",
+                                          _0: 1976,
+                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -323,10 +323,10 @@ var suites_1 = {
                                       "getMilliseconds",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: 789,
-                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getMilliseconds()
-                                                };
+                                            TAG: "Eq",
+                                            _0: 789,
+                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getMilliseconds()
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -334,10 +334,10 @@ var suites_1 = {
                                         "getSeconds",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: 56,
-                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getSeconds()
-                                                  };
+                                              TAG: "Eq",
+                                              _0: 56,
+                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getSeconds()
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -345,10 +345,10 @@ var suites_1 = {
                                           "getTime",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: 195131516789,
-                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                                                    };
+                                                TAG: "Eq",
+                                                _0: 195131516789,
+                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -356,10 +356,10 @@ var suites_1 = {
                                             "getUTCDate",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: 8,
-                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDate()
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: 8,
+                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDate()
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -367,10 +367,10 @@ var suites_1 = {
                                               "getUTCDay",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: 1,
-                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDay()
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: 1,
+                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDay()
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -378,10 +378,10 @@ var suites_1 = {
                                                 "getUTCFUllYear",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: 1976,
-                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCFullYear()
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: 1976,
+                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCFullYear()
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -389,10 +389,10 @@ var suites_1 = {
                                                   "getUTCHours",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: 11,
-                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCHours()
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: 11,
+                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCHours()
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -400,10 +400,10 @@ var suites_1 = {
                                                     "getUTCMilliseconds",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: 789,
-                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMilliseconds()
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: 789,
+                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMilliseconds()
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -411,10 +411,10 @@ var suites_1 = {
                                                       "getUTCMinutes",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: 11,
-                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMinutes()
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: 11,
+                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMinutes()
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -422,10 +422,10 @@ var suites_1 = {
                                                         "getUTCMonth",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: 2,
-                                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMonth()
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: 2,
+                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMonth()
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -433,10 +433,10 @@ var suites_1 = {
                                                           "getUTCSeconds",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: 56,
-                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCSeconds()
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: 56,
+                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCSeconds()
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -444,10 +444,10 @@ var suites_1 = {
                                                             "getYear",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: 1976,
-                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: 1976,
+                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -457,10 +457,10 @@ var suites_1 = {
                                                                   var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                   d.setDate(12);
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: 12,
-                                                                          _1: d.getDate()
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: 12,
+                                                                    _1: d.getDate()
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -470,10 +470,10 @@ var suites_1 = {
                                                                     var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                     d.setFullYear(1986);
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: 1986,
-                                                                            _1: d.getFullYear()
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: 1986,
+                                                                      _1: d.getFullYear()
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -483,16 +483,16 @@ var suites_1 = {
                                                                       var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                       d.setFullYear(1986, 7);
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: [
-                                                                                1986,
-                                                                                7
-                                                                              ],
-                                                                              _1: [
-                                                                                d.getFullYear(),
-                                                                                d.getMonth()
-                                                                              ]
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: [
+                                                                          1986,
+                                                                          7
+                                                                        ],
+                                                                        _1: [
+                                                                          d.getFullYear(),
+                                                                          d.getMonth()
+                                                                        ]
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -502,18 +502,18 @@ var suites_1 = {
                                                                         var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                         d.setFullYear(1986, 7, 23);
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: [
-                                                                                  1986,
-                                                                                  7,
-                                                                                  23
-                                                                                ],
-                                                                                _1: [
-                                                                                  d.getFullYear(),
-                                                                                  d.getMonth(),
-                                                                                  d.getDate()
-                                                                                ]
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: [
+                                                                            1986,
+                                                                            7,
+                                                                            23
+                                                                          ],
+                                                                          _1: [
+                                                                            d.getFullYear(),
+                                                                            d.getMonth(),
+                                                                            d.getDate()
+                                                                          ]
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -523,10 +523,10 @@ var suites_1 = {
                                                                           var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                           d.setHours(22);
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 22,
-                                                                                  _1: d.getHours()
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: 22,
+                                                                            _1: d.getHours()
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -536,16 +536,16 @@ var suites_1 = {
                                                                             var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                             d.setHours(22, 48);
                                                                             return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: [
-                                                                                      22,
-                                                                                      48
-                                                                                    ],
-                                                                                    _1: [
-                                                                                      d.getHours(),
-                                                                                      d.getMinutes()
-                                                                                    ]
-                                                                                  };
+                                                                              TAG: "Eq",
+                                                                              _0: [
+                                                                                22,
+                                                                                48
+                                                                              ],
+                                                                              _1: [
+                                                                                d.getHours(),
+                                                                                d.getMinutes()
+                                                                              ]
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -555,18 +555,18 @@ var suites_1 = {
                                                                               var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                               d.setHours(22, 48, 54);
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: [
-                                                                                        22,
-                                                                                        48,
-                                                                                        54
-                                                                                      ],
-                                                                                      _1: [
-                                                                                        d.getHours(),
-                                                                                        d.getMinutes(),
-                                                                                        d.getSeconds()
-                                                                                      ]
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: [
+                                                                                  22,
+                                                                                  48,
+                                                                                  54
+                                                                                ],
+                                                                                _1: [
+                                                                                  d.getHours(),
+                                                                                  d.getMinutes(),
+                                                                                  d.getSeconds()
+                                                                                ]
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -576,10 +576,10 @@ var suites_1 = {
                                                                                 var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                 d.setMilliseconds(543);
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 543,
-                                                                                        _1: d.getMilliseconds()
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: 543,
+                                                                                  _1: d.getMilliseconds()
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -589,10 +589,10 @@ var suites_1 = {
                                                                                   var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                   d.setMinutes(18);
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 18,
-                                                                                          _1: d.getMinutes()
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: 18,
+                                                                                    _1: d.getMinutes()
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -602,16 +602,16 @@ var suites_1 = {
                                                                                     var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                     d.setMinutes(18, 42);
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              18,
-                                                                                              42
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              d.getMinutes(),
-                                                                                              d.getSeconds()
-                                                                                            ]
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: [
+                                                                                        18,
+                                                                                        42
+                                                                                      ],
+                                                                                      _1: [
+                                                                                        d.getMinutes(),
+                                                                                        d.getSeconds()
+                                                                                      ]
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -621,18 +621,18 @@ var suites_1 = {
                                                                                       var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                       d.setMinutes(18, 42, 311);
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: [
-                                                                                                18,
-                                                                                                42,
-                                                                                                311
-                                                                                              ],
-                                                                                              _1: [
-                                                                                                d.getMinutes(),
-                                                                                                d.getSeconds(),
-                                                                                                d.getMilliseconds()
-                                                                                              ]
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: [
+                                                                                          18,
+                                                                                          42,
+                                                                                          311
+                                                                                        ],
+                                                                                        _1: [
+                                                                                          d.getMinutes(),
+                                                                                          d.getSeconds(),
+                                                                                          d.getMilliseconds()
+                                                                                        ]
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -642,10 +642,10 @@ var suites_1 = {
                                                                                         var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                         d.setMonth(10);
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 10,
-                                                                                                _1: d.getMonth()
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: 10,
+                                                                                          _1: d.getMonth()
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -655,16 +655,16 @@ var suites_1 = {
                                                                                           var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                           d.setMonth(10, 14);
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: [
-                                                                                                    10,
-                                                                                                    14
-                                                                                                  ],
-                                                                                                  _1: [
-                                                                                                    d.getMonth(),
-                                                                                                    d.getDate()
-                                                                                                  ]
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: [
+                                                                                              10,
+                                                                                              14
+                                                                                            ],
+                                                                                            _1: [
+                                                                                              d.getMonth(),
+                                                                                              d.getDate()
+                                                                                            ]
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -674,10 +674,10 @@ var suites_1 = {
                                                                                             var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                             d.setSeconds(36);
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 36,
-                                                                                                    _1: d.getSeconds()
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: 36,
+                                                                                              _1: d.getSeconds()
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -687,16 +687,16 @@ var suites_1 = {
                                                                                               var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                               d.setSeconds(36, 420);
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: [
-                                                                                                        36,
-                                                                                                        420
-                                                                                                      ],
-                                                                                                      _1: [
-                                                                                                        d.getSeconds(),
-                                                                                                        d.getMilliseconds()
-                                                                                                      ]
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: [
+                                                                                                  36,
+                                                                                                  420
+                                                                                                ],
+                                                                                                _1: [
+                                                                                                  d.getSeconds(),
+                                                                                                  d.getMilliseconds()
+                                                                                                ]
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -706,10 +706,10 @@ var suites_1 = {
                                                                                                 var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                 d.setUTCDate(12);
                                                                                                 return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: 12,
-                                                                                                        _1: d.getUTCDate()
-                                                                                                      };
+                                                                                                  TAG: "Eq",
+                                                                                                  _0: 12,
+                                                                                                  _1: d.getUTCDate()
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -719,10 +719,10 @@ var suites_1 = {
                                                                                                   var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                   d.setUTCFullYear(1986);
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 1986,
-                                                                                                          _1: d.getUTCFullYear()
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: 1986,
+                                                                                                    _1: d.getUTCFullYear()
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -732,16 +732,16 @@ var suites_1 = {
                                                                                                     var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                     d.setUTCFullYear(1986, 7);
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: [
-                                                                                                              1986,
-                                                                                                              7
-                                                                                                            ],
-                                                                                                            _1: [
-                                                                                                              d.getUTCFullYear(),
-                                                                                                              d.getUTCMonth()
-                                                                                                            ]
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: [
+                                                                                                        1986,
+                                                                                                        7
+                                                                                                      ],
+                                                                                                      _1: [
+                                                                                                        d.getUTCFullYear(),
+                                                                                                        d.getUTCMonth()
+                                                                                                      ]
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -751,18 +751,18 @@ var suites_1 = {
                                                                                                       var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                       d.setUTCFullYear(1986, 7, 23);
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: [
-                                                                                                                1986,
-                                                                                                                7,
-                                                                                                                23
-                                                                                                              ],
-                                                                                                              _1: [
-                                                                                                                d.getUTCFullYear(),
-                                                                                                                d.getUTCMonth(),
-                                                                                                                d.getUTCDate()
-                                                                                                              ]
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: [
+                                                                                                          1986,
+                                                                                                          7,
+                                                                                                          23
+                                                                                                        ],
+                                                                                                        _1: [
+                                                                                                          d.getUTCFullYear(),
+                                                                                                          d.getUTCMonth(),
+                                                                                                          d.getUTCDate()
+                                                                                                        ]
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -772,10 +772,10 @@ var suites_1 = {
                                                                                                         var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                         d.setUTCHours(22);
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: 22,
-                                                                                                                _1: d.getUTCHours()
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: 22,
+                                                                                                          _1: d.getUTCHours()
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -785,16 +785,16 @@ var suites_1 = {
                                                                                                           var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                           d.setUTCHours(22, 48);
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: [
-                                                                                                                    22,
-                                                                                                                    48
-                                                                                                                  ],
-                                                                                                                  _1: [
-                                                                                                                    d.getUTCHours(),
-                                                                                                                    d.getUTCMinutes()
-                                                                                                                  ]
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: [
+                                                                                                              22,
+                                                                                                              48
+                                                                                                            ],
+                                                                                                            _1: [
+                                                                                                              d.getUTCHours(),
+                                                                                                              d.getUTCMinutes()
+                                                                                                            ]
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -804,18 +804,18 @@ var suites_1 = {
                                                                                                             var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                             d.setUTCHours(22, 48, 54);
                                                                                                             return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: [
-                                                                                                                      22,
-                                                                                                                      48,
-                                                                                                                      54
-                                                                                                                    ],
-                                                                                                                    _1: [
-                                                                                                                      d.getUTCHours(),
-                                                                                                                      d.getUTCMinutes(),
-                                                                                                                      d.getUTCSeconds()
-                                                                                                                    ]
-                                                                                                                  };
+                                                                                                              TAG: "Eq",
+                                                                                                              _0: [
+                                                                                                                22,
+                                                                                                                48,
+                                                                                                                54
+                                                                                                              ],
+                                                                                                              _1: [
+                                                                                                                d.getUTCHours(),
+                                                                                                                d.getUTCMinutes(),
+                                                                                                                d.getUTCSeconds()
+                                                                                                              ]
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -825,10 +825,10 @@ var suites_1 = {
                                                                                                               var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                               d.setUTCMilliseconds(543);
                                                                                                               return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: 543,
-                                                                                                                      _1: d.getUTCMilliseconds()
-                                                                                                                    };
+                                                                                                                TAG: "Eq",
+                                                                                                                _0: 543,
+                                                                                                                _1: d.getUTCMilliseconds()
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -838,10 +838,10 @@ var suites_1 = {
                                                                                                                 var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                 d.setUTCMinutes(18);
                                                                                                                 return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: 18,
-                                                                                                                        _1: d.getUTCMinutes()
-                                                                                                                      };
+                                                                                                                  TAG: "Eq",
+                                                                                                                  _0: 18,
+                                                                                                                  _1: d.getUTCMinutes()
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -851,16 +851,16 @@ var suites_1 = {
                                                                                                                   var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                   d.setUTCMinutes(18, 42);
                                                                                                                   return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: [
-                                                                                                                            18,
-                                                                                                                            42
-                                                                                                                          ],
-                                                                                                                          _1: [
-                                                                                                                            d.getUTCMinutes(),
-                                                                                                                            d.getUTCSeconds()
-                                                                                                                          ]
-                                                                                                                        };
+                                                                                                                    TAG: "Eq",
+                                                                                                                    _0: [
+                                                                                                                      18,
+                                                                                                                      42
+                                                                                                                    ],
+                                                                                                                    _1: [
+                                                                                                                      d.getUTCMinutes(),
+                                                                                                                      d.getUTCSeconds()
+                                                                                                                    ]
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -870,18 +870,18 @@ var suites_1 = {
                                                                                                                     var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                     d.setUTCMinutes(18, 42, 311);
                                                                                                                     return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: [
-                                                                                                                              18,
-                                                                                                                              42,
-                                                                                                                              311
-                                                                                                                            ],
-                                                                                                                            _1: [
-                                                                                                                              d.getUTCMinutes(),
-                                                                                                                              d.getUTCSeconds(),
-                                                                                                                              d.getUTCMilliseconds()
-                                                                                                                            ]
-                                                                                                                          };
+                                                                                                                      TAG: "Eq",
+                                                                                                                      _0: [
+                                                                                                                        18,
+                                                                                                                        42,
+                                                                                                                        311
+                                                                                                                      ],
+                                                                                                                      _1: [
+                                                                                                                        d.getUTCMinutes(),
+                                                                                                                        d.getUTCSeconds(),
+                                                                                                                        d.getUTCMilliseconds()
+                                                                                                                      ]
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -891,10 +891,10 @@ var suites_1 = {
                                                                                                                       var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                       d.setUTCMonth(10);
                                                                                                                       return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 10,
-                                                                                                                              _1: d.getUTCMonth()
-                                                                                                                            };
+                                                                                                                        TAG: "Eq",
+                                                                                                                        _0: 10,
+                                                                                                                        _1: d.getUTCMonth()
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -904,16 +904,16 @@ var suites_1 = {
                                                                                                                         var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                         d.setUTCMonth(10, 14);
                                                                                                                         return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: [
-                                                                                                                                  10,
-                                                                                                                                  14
-                                                                                                                                ],
-                                                                                                                                _1: [
-                                                                                                                                  d.getUTCMonth(),
-                                                                                                                                  d.getUTCDate()
-                                                                                                                                ]
-                                                                                                                              };
+                                                                                                                          TAG: "Eq",
+                                                                                                                          _0: [
+                                                                                                                            10,
+                                                                                                                            14
+                                                                                                                          ],
+                                                                                                                          _1: [
+                                                                                                                            d.getUTCMonth(),
+                                                                                                                            d.getUTCDate()
+                                                                                                                          ]
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: {
@@ -923,10 +923,10 @@ var suites_1 = {
                                                                                                                           var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                           d.setUTCSeconds(36);
                                                                                                                           return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: 36,
-                                                                                                                                  _1: d.getUTCSeconds()
-                                                                                                                                };
+                                                                                                                            TAG: "Eq",
+                                                                                                                            _0: 36,
+                                                                                                                            _1: d.getUTCSeconds()
+                                                                                                                          };
                                                                                                                         })
                                                                                                                     ],
                                                                                                                     tl: {
@@ -936,16 +936,16 @@ var suites_1 = {
                                                                                                                             var d = new Date("1976-03-08T12:34:56.789+01:23");
                                                                                                                             d.setUTCSeconds(36, 420);
                                                                                                                             return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: [
-                                                                                                                                      36,
-                                                                                                                                      420
-                                                                                                                                    ],
-                                                                                                                                    _1: [
-                                                                                                                                      d.getUTCSeconds(),
-                                                                                                                                      d.getUTCMilliseconds()
-                                                                                                                                    ]
-                                                                                                                                  };
+                                                                                                                              TAG: "Eq",
+                                                                                                                              _0: [
+                                                                                                                                36,
+                                                                                                                                420
+                                                                                                                              ],
+                                                                                                                              _1: [
+                                                                                                                                d.getUTCSeconds(),
+                                                                                                                                d.getUTCMilliseconds()
+                                                                                                                              ]
+                                                                                                                            };
                                                                                                                           })
                                                                                                                       ],
                                                                                                                       tl: {
@@ -953,10 +953,10 @@ var suites_1 = {
                                                                                                                           "toDateString",
                                                                                                                           (function (param) {
                                                                                                                               return {
-                                                                                                                                      TAG: "Eq",
-                                                                                                                                      _0: "Mon Mar 08 1976",
-                                                                                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").toDateString()
-                                                                                                                                    };
+                                                                                                                                TAG: "Eq",
+                                                                                                                                _0: "Mon Mar 08 1976",
+                                                                                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").toDateString()
+                                                                                                                              };
                                                                                                                             })
                                                                                                                         ],
                                                                                                                         tl: {
@@ -964,10 +964,10 @@ var suites_1 = {
                                                                                                                             "toGMTString",
                                                                                                                             (function (param) {
                                                                                                                                 return {
-                                                                                                                                        TAG: "Eq",
-                                                                                                                                        _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                      };
+                                                                                                                                  TAG: "Eq",
+                                                                                                                                  _0: "Mon, 08 Mar 1976 11:11:56 GMT",
+                                                                                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
+                                                                                                                                };
                                                                                                                               })
                                                                                                                           ],
                                                                                                                           tl: {
@@ -975,10 +975,10 @@ var suites_1 = {
                                                                                                                               "toISOString",
                                                                                                                               (function (param) {
                                                                                                                                   return {
-                                                                                                                                          TAG: "Eq",
-                                                                                                                                          _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").toISOString()
-                                                                                                                                        };
+                                                                                                                                    TAG: "Eq",
+                                                                                                                                    _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").toISOString()
+                                                                                                                                  };
                                                                                                                                 })
                                                                                                                             ],
                                                                                                                             tl: {
@@ -986,10 +986,10 @@ var suites_1 = {
                                                                                                                                 "toJSON",
                                                                                                                                 (function (param) {
                                                                                                                                     return {
-                                                                                                                                            TAG: "Eq",
-                                                                                                                                            _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
-                                                                                                                                          };
+                                                                                                                                      TAG: "Eq",
+                                                                                                                                      _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
+                                                                                                                                    };
                                                                                                                                   })
                                                                                                                               ],
                                                                                                                               tl: {
@@ -997,10 +997,10 @@ var suites_1 = {
                                                                                                                                   "toJSONUnsafe",
                                                                                                                                   (function (param) {
                                                                                                                                       return {
-                                                                                                                                              TAG: "Eq",
-                                                                                                                                              _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
-                                                                                                                                            };
+                                                                                                                                        TAG: "Eq",
+                                                                                                                                        _0: "1976-03-08T11:11:56.789Z",
+                                                                                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
+                                                                                                                                      };
                                                                                                                                     })
                                                                                                                                 ],
                                                                                                                                 tl: {
@@ -1008,10 +1008,10 @@ var suites_1 = {
                                                                                                                                     "toUTCString",
                                                                                                                                     (function (param) {
                                                                                                                                         return {
-                                                                                                                                                TAG: "Eq",
-                                                                                                                                                _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                              };
+                                                                                                                                          TAG: "Eq",
+                                                                                                                                          _0: "Mon, 08 Mar 1976 11:11:56 GMT",
+                                                                                                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
+                                                                                                                                        };
                                                                                                                                       })
                                                                                                                                   ],
                                                                                                                                   tl: {
@@ -1022,9 +1022,9 @@ var suites_1 = {
                                                                                                                                           var b = new Date("2013-03-01T01:10:00");
                                                                                                                                           var c = new Date("2013-03-01T01:10:01");
                                                                                                                                           return {
-                                                                                                                                                  TAG: "Ok",
-                                                                                                                                                  _0: Caml_obj.equal(a, b) && Caml_obj.notequal(b, c) && Caml_obj.greaterthan(c, b)
-                                                                                                                                                };
+                                                                                                                                            TAG: "Ok",
+                                                                                                                                            _0: Caml_obj.equal(a, b) && Caml_obj.notequal(b, c) && Caml_obj.greaterthan(c, b)
+                                                                                                                                          };
                                                                                                                                         })
                                                                                                                                     ],
                                                                                                                                     tl: /* [] */0
diff --git a/jscomp/test/js_dict_test.js b/jscomp/test/js_dict_test.js
index e0a31cdfd21..0453098f944 100644
--- a/jscomp/test/js_dict_test.js
+++ b/jscomp/test/js_dict_test.js
@@ -6,19 +6,19 @@ var Js_dict = require("../../lib/js/js_dict.js");
 
 function obj(param) {
   return {
-          foo: 43,
-          bar: 86
-        };
+    foo: 43,
+    bar: 86
+  };
 }
 
 var suites_0 = [
   "empty",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: [],
-              _1: Object.keys({})
-            };
+        TAG: "Eq",
+        _0: [],
+        _1: Object.keys({})
+      };
     })
 ];
 
@@ -27,13 +27,13 @@ var suites_1 = {
     "get",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 43,
-                _1: Js_dict.get({
-                      foo: 43,
-                      bar: 86
-                    }, "foo")
-              };
+          TAG: "Eq",
+          _0: 43,
+          _1: Js_dict.get({
+                foo: 43,
+                bar: 86
+              }, "foo")
+        };
       })
   ],
   tl: {
@@ -41,13 +41,13 @@ var suites_1 = {
       "get - property not in object",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: undefined,
-                  _1: Js_dict.get({
-                        foo: 43,
-                        bar: 86
-                      }, "baz")
-                };
+            TAG: "Eq",
+            _0: undefined,
+            _1: Js_dict.get({
+                  foo: 43,
+                  bar: 86
+                }, "baz")
+          };
         })
     ],
     tl: {
@@ -55,13 +55,13 @@ var suites_1 = {
         "unsafe_get",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: 43,
-                    _1: ({
-                          foo: 43,
-                          bar: 86
-                        })["foo"]
-                  };
+              TAG: "Eq",
+              _0: 43,
+              _1: ({
+                  foo: 43,
+                  bar: 86
+                })["foo"]
+            };
           })
       ],
       tl: {
@@ -74,10 +74,10 @@ var suites_1 = {
               };
               o["foo"] = 36;
               return {
-                      TAG: "Eq",
-                      _0: 36,
-                      _1: Js_dict.get(o, "foo")
-                    };
+                TAG: "Eq",
+                _0: 36,
+                _1: Js_dict.get(o, "foo")
+              };
             })
         ],
         tl: {
@@ -85,16 +85,16 @@ var suites_1 = {
             "keys",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: [
-                          "foo",
-                          "bar"
-                        ],
-                        _1: Object.keys({
-                              foo: 43,
-                              bar: 86
-                            })
-                      };
+                  TAG: "Eq",
+                  _0: [
+                    "foo",
+                    "bar"
+                  ],
+                  _1: Object.keys({
+                        foo: 43,
+                        bar: 86
+                      })
+                };
               })
           ],
           tl: {
@@ -102,22 +102,22 @@ var suites_1 = {
               "entries",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: [
-                            [
-                              "foo",
-                              43
-                            ],
-                            [
-                              "bar",
-                              86
-                            ]
-                          ],
-                          _1: Js_dict.entries({
-                                foo: 43,
-                                bar: 86
-                              })
-                        };
+                    TAG: "Eq",
+                    _0: [
+                      [
+                        "foo",
+                        43
+                      ],
+                      [
+                        "bar",
+                        86
+                      ]
+                    ],
+                    _1: Js_dict.entries({
+                          foo: 43,
+                          bar: 86
+                        })
+                  };
                 })
             ],
             tl: {
@@ -125,16 +125,16 @@ var suites_1 = {
                 "values",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: [
-                              43,
-                              86
-                            ],
-                            _1: Js_dict.values({
-                                  foo: 43,
-                                  bar: 86
-                                })
-                          };
+                      TAG: "Eq",
+                      _0: [
+                        43,
+                        86
+                      ],
+                      _1: Js_dict.values({
+                            foo: 43,
+                            bar: 86
+                          })
+                    };
                   })
               ],
               tl: {
@@ -142,10 +142,10 @@ var suites_1 = {
                   "fromList - []",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: {},
-                              _1: Js_dict.fromList(/* [] */0)
-                            };
+                        TAG: "Eq",
+                        _0: {},
+                        _1: Js_dict.fromList(/* [] */0)
+                      };
                     })
                 ],
                 tl: {
@@ -153,31 +153,31 @@ var suites_1 = {
                     "fromList",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: [
-                                  [
-                                    "x",
-                                    23
-                                  ],
-                                  [
-                                    "y",
-                                    46
-                                  ]
-                                ],
-                                _1: Js_dict.entries(Js_dict.fromList({
-                                          hd: [
-                                            "x",
-                                            23
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "y",
-                                              46
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }))
-                              };
+                          TAG: "Eq",
+                          _0: [
+                            [
+                              "x",
+                              23
+                            ],
+                            [
+                              "y",
+                              46
+                            ]
+                          ],
+                          _1: Js_dict.entries(Js_dict.fromList({
+                                    hd: [
+                                      "x",
+                                      23
+                                    ],
+                                    tl: {
+                                      hd: [
+                                        "y",
+                                        46
+                                      ],
+                                      tl: /* [] */0
+                                    }
+                                  }))
+                        };
                       })
                   ],
                   tl: {
@@ -185,10 +185,10 @@ var suites_1 = {
                       "fromArray - []",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: {},
-                                  _1: Js_dict.fromArray([])
-                                };
+                            TAG: "Eq",
+                            _0: {},
+                            _1: Js_dict.fromArray([])
+                          };
                         })
                     ],
                     tl: {
@@ -196,28 +196,28 @@ var suites_1 = {
                         "fromArray",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      [
-                                        "x",
-                                        23
-                                      ],
-                                      [
-                                        "y",
-                                        46
-                                      ]
-                                    ],
-                                    _1: Js_dict.entries(Js_dict.fromArray([
-                                              [
-                                                "x",
-                                                23
-                                              ],
-                                              [
-                                                "y",
-                                                46
-                                              ]
-                                            ]))
-                                  };
+                              TAG: "Eq",
+                              _0: [
+                                [
+                                  "x",
+                                  23
+                                ],
+                                [
+                                  "y",
+                                  46
+                                ]
+                              ],
+                              _1: Js_dict.entries(Js_dict.fromArray([
+                                        [
+                                          "x",
+                                          23
+                                        ],
+                                        [
+                                          "y",
+                                          46
+                                        ]
+                                      ]))
+                            };
                           })
                       ],
                       tl: {
@@ -225,18 +225,18 @@ var suites_1 = {
                           "map",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: {
-                                        foo: "43",
-                                        bar: "86"
-                                      },
-                                      _1: Js_dict.map((function (i) {
-                                              return String(i);
-                                            }), {
-                                            foo: 43,
-                                            bar: 86
-                                          })
-                                    };
+                                TAG: "Eq",
+                                _0: {
+                                  foo: "43",
+                                  bar: "86"
+                                },
+                                _1: Js_dict.map((function (i) {
+                                        return String(i);
+                                      }), {
+                                      foo: 43,
+                                      bar: 86
+                                    })
+                              };
                             })
                         ],
                         tl: /* [] */0
diff --git a/jscomp/test/js_exception_catch_test.js b/jscomp/test/js_exception_catch_test.js
index 59ecc6fea44..2bdeabb7670 100644
--- a/jscomp/test/js_exception_catch_test.js
+++ b/jscomp/test/js_exception_catch_test.js
@@ -30,28 +30,28 @@ function add_test(loc, test) {
 function eq(loc, x, y) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         }));
 }
 
 function false_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
 function true_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: true
-                };
+            TAG: "Ok",
+            _0: true
+          };
         }));
 }
 
@@ -68,9 +68,9 @@ catch (raw_x){
   if (x.RE_EXN_ID === Js_exn.$$Error) {
     add_test("File \"js_exception_catch_test.res\", line 18, characters 37-44", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: true
-                  };
+              TAG: "Ok",
+              _0: true
+            };
           }));
   } else {
     throw x;
@@ -80,9 +80,9 @@ catch (raw_x){
 if (exit === 1) {
   add_test("File \"js_exception_catch_test.res\", line 19, characters 14-21", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -135,66 +135,66 @@ eq("File \"js_exception_catch_test.res\", line 44, characters 5-12", test(functi
 
 eq("File \"js_exception_catch_test.res\", line 45, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Not_found",
+            Error: new Error()
+          };
         }), "Not_found");
 
 eq("File \"js_exception_catch_test.res\", line 46, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "x",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "x",
+            Error: new Error()
+          };
         }), "Invalid_argument");
 
 eq("File \"js_exception_catch_test.res\", line 47, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "",
+            Error: new Error()
+          };
         }), "Invalid_any");
 
 eq("File \"js_exception_catch_test.res\", line 48, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: A,
-                _1: 2,
-                Error: new Error()
-              };
+            RE_EXN_ID: A,
+            _1: 2,
+            Error: new Error()
+          };
         }), "A2");
 
 eq("File \"js_exception_catch_test.res\", line 49, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: A,
-                _1: 3,
-                Error: new Error()
-              };
+            RE_EXN_ID: A,
+            _1: 3,
+            Error: new Error()
+          };
         }), "A_any");
 
 eq("File \"js_exception_catch_test.res\", line 50, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: B,
-                Error: new Error()
-              };
+            RE_EXN_ID: B,
+            Error: new Error()
+          };
         }), "B");
 
 eq("File \"js_exception_catch_test.res\", line 51, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: C,
-                _1: 1,
-                _2: 2,
-                Error: new Error()
-              };
+            RE_EXN_ID: C,
+            _1: 1,
+            _2: 2,
+            Error: new Error()
+          };
         }), "C");
 
 eq("File \"js_exception_catch_test.res\", line 52, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: C,
-                _1: 0,
-                _2: 2,
-                Error: new Error()
-              };
+            RE_EXN_ID: C,
+            _1: 0,
+            _2: 2,
+            Error: new Error()
+          };
         }), "C_any");
 
 eq("File \"js_exception_catch_test.res\", line 53, characters 5-12", test(function (param) {
@@ -203,10 +203,10 @@ eq("File \"js_exception_catch_test.res\", line 53, characters 5-12", test(functi
 
 eq("File \"js_exception_catch_test.res\", line 54, characters 5-12", test(function (param) {
           throw {
-                RE_EXN_ID: "Failure",
-                _1: "x",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Failure",
+            _1: "x",
+            Error: new Error()
+          };
         }), "Any");
 
 Mt.from_pair_suites("Js_exception_catch_test", suites.contents);
diff --git a/jscomp/test/js_float_test.js b/jscomp/test/js_float_test.js
index b2d4567cc98..2971a30702e 100644
--- a/jscomp/test/js_float_test.js
+++ b/jscomp/test/js_float_test.js
@@ -8,10 +8,10 @@ var suites_0 = [
   "_NaN <> _NaN",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: false,
-              _1: NaN === NaN
-            };
+        TAG: "Eq",
+        _0: false,
+        _1: NaN === NaN
+      };
     })
 ];
 
@@ -20,10 +20,10 @@ var suites_1 = {
     "isNaN - _NaN",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: true,
-                _1: Number.isNaN(NaN)
-              };
+          TAG: "Eq",
+          _0: true,
+          _1: Number.isNaN(NaN)
+        };
       })
   ],
   tl: {
@@ -31,10 +31,10 @@ var suites_1 = {
       "isNaN - 0.",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: false,
-                  _1: Number.isNaN(0)
-                };
+            TAG: "Eq",
+            _0: false,
+            _1: Number.isNaN(0)
+          };
         })
     ],
     tl: {
@@ -42,10 +42,10 @@ var suites_1 = {
         "isFinite - infinity",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: Number.isFinite(Pervasives.infinity)
-                  };
+              TAG: "Eq",
+              _0: false,
+              _1: Number.isFinite(Pervasives.infinity)
+            };
           })
       ],
       tl: {
@@ -53,10 +53,10 @@ var suites_1 = {
           "isFinite - neg_infinity",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: false,
-                      _1: Number.isFinite(Pervasives.neg_infinity)
-                    };
+                TAG: "Eq",
+                _0: false,
+                _1: Number.isFinite(Pervasives.neg_infinity)
+              };
             })
         ],
         tl: {
@@ -64,10 +64,10 @@ var suites_1 = {
             "isFinite - _NaN",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Number.isFinite(NaN)
-                      };
+                  TAG: "Eq",
+                  _0: false,
+                  _1: Number.isFinite(NaN)
+                };
               })
           ],
           tl: {
@@ -75,10 +75,10 @@ var suites_1 = {
               "isFinite - 0.",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Number.isFinite(0)
-                        };
+                    TAG: "Eq",
+                    _0: true,
+                    _1: Number.isFinite(0)
+                  };
                 })
             ],
             tl: {
@@ -86,10 +86,10 @@ var suites_1 = {
                 "toExponential",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: "1.23456e+2",
-                            _1: (123.456).toExponential()
-                          };
+                      TAG: "Eq",
+                      _0: "1.23456e+2",
+                      _1: (123.456).toExponential()
+                    };
                   })
               ],
               tl: {
@@ -97,10 +97,10 @@ var suites_1 = {
                   "toExponential - large number",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: "1.2e+21",
-                              _1: (1.2e21).toExponential()
-                            };
+                        TAG: "Eq",
+                        _0: "1.2e+21",
+                        _1: (1.2e21).toExponential()
+                      };
                     })
                 ],
                 tl: {
@@ -108,10 +108,10 @@ var suites_1 = {
                     "toExponentialWithPrecision - digits:2",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: "1.23e+2",
-                                _1: (123.456).toExponential(2)
-                              };
+                          TAG: "Eq",
+                          _0: "1.23e+2",
+                          _1: (123.456).toExponential(2)
+                        };
                       })
                   ],
                   tl: {
@@ -119,10 +119,10 @@ var suites_1 = {
                       "toExponentialWithPrecision - digits:4",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: "1.2346e+2",
-                                  _1: (123.456).toExponential(4)
-                                };
+                            TAG: "Eq",
+                            _0: "1.2346e+2",
+                            _1: (123.456).toExponential(4)
+                          };
                         })
                     ],
                     tl: {
@@ -130,10 +130,10 @@ var suites_1 = {
                         "toExponentialWithPrecision - digits:20",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: "0.00000000000000000000e+0",
-                                    _1: (0).toExponential(20)
-                                  };
+                              TAG: "Eq",
+                              _0: "0.00000000000000000000e+0",
+                              _1: (0).toExponential(20)
+                            };
                           })
                       ],
                       tl: {
@@ -141,11 +141,11 @@ var suites_1 = {
                           "File \"js_float_test.res\", line 27, characters 5-12",
                           (function (param) {
                               return {
-                                      TAG: "ThrowAny",
-                                      _0: (function (param) {
-                                          (0).toExponential(101);
-                                        })
-                                    };
+                                TAG: "ThrowAny",
+                                _0: (function (param) {
+                                    (0).toExponential(101);
+                                  })
+                              };
                             })
                         ],
                         tl: {
@@ -153,11 +153,11 @@ var suites_1 = {
                             "toExponentialWithPrecision - digits:-1",
                             (function (param) {
                                 return {
-                                        TAG: "ThrowAny",
-                                        _0: (function (param) {
-                                            (0).toExponential(-1);
-                                          })
-                                      };
+                                  TAG: "ThrowAny",
+                                  _0: (function (param) {
+                                      (0).toExponential(-1);
+                                    })
+                                };
                               })
                           ],
                           tl: {
@@ -165,10 +165,10 @@ var suites_1 = {
                               "toFixed",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: "123",
-                                          _1: (123.456).toFixed()
-                                        };
+                                    TAG: "Eq",
+                                    _0: "123",
+                                    _1: (123.456).toFixed()
+                                  };
                                 })
                             ],
                             tl: {
@@ -176,10 +176,10 @@ var suites_1 = {
                                 "toFixed - large number",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: "1.2e+21",
-                                            _1: (1.2e21).toFixed()
-                                          };
+                                      TAG: "Eq",
+                                      _0: "1.2e+21",
+                                      _1: (1.2e21).toFixed()
+                                    };
                                   })
                               ],
                               tl: {
@@ -187,10 +187,10 @@ var suites_1 = {
                                   "toFixedWithPrecision - digits:2",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: "123.46",
-                                              _1: (123.456).toFixed(2)
-                                            };
+                                        TAG: "Eq",
+                                        _0: "123.46",
+                                        _1: (123.456).toFixed(2)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -198,10 +198,10 @@ var suites_1 = {
                                     "toFixedWithPrecision - digits:4",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: "123.4560",
-                                                _1: (123.456).toFixed(4)
-                                              };
+                                          TAG: "Eq",
+                                          _0: "123.4560",
+                                          _1: (123.456).toFixed(4)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -209,10 +209,10 @@ var suites_1 = {
                                       "toFixedWithPrecision - digits:20",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: "0.00000000000000000000",
-                                                  _1: (0).toFixed(20)
-                                                };
+                                            TAG: "Eq",
+                                            _0: "0.00000000000000000000",
+                                            _1: (0).toFixed(20)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -220,11 +220,11 @@ var suites_1 = {
                                         "toFixedWithPrecision - digits:101",
                                         (function (param) {
                                             return {
-                                                    TAG: "ThrowAny",
-                                                    _0: (function (param) {
-                                                        (0).toFixed(101);
-                                                      })
-                                                  };
+                                              TAG: "ThrowAny",
+                                              _0: (function (param) {
+                                                  (0).toFixed(101);
+                                                })
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -232,11 +232,11 @@ var suites_1 = {
                                           "toFixedWithPrecision - digits:-1",
                                           (function (param) {
                                               return {
-                                                      TAG: "ThrowAny",
-                                                      _0: (function (param) {
-                                                          (0).toFixed(-1);
-                                                        })
-                                                    };
+                                                TAG: "ThrowAny",
+                                                _0: (function (param) {
+                                                    (0).toFixed(-1);
+                                                  })
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -244,10 +244,10 @@ var suites_1 = {
                                             "toPrecision",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: "123.456",
-                                                        _1: (123.456).toPrecision()
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: "123.456",
+                                                  _1: (123.456).toPrecision()
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -255,10 +255,10 @@ var suites_1 = {
                                               "toPrecision - large number",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: "1.2e+21",
-                                                          _1: (1.2e21).toPrecision()
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: "1.2e+21",
+                                                    _1: (1.2e21).toPrecision()
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -266,10 +266,10 @@ var suites_1 = {
                                                 "toPrecisionWithPrecision - digits:2",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: "1.2e+2",
-                                                            _1: (123.456).toPrecision(2)
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: "1.2e+2",
+                                                      _1: (123.456).toPrecision(2)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -277,10 +277,10 @@ var suites_1 = {
                                                   "toPrecisionWithPrecision - digits:4",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: "123.5",
-                                                              _1: (123.456).toPrecision(4)
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: "123.5",
+                                                        _1: (123.456).toPrecision(4)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -288,10 +288,10 @@ var suites_1 = {
                                                     "toPrecisionWithPrecision - digits:20",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: "0.0000000000000000000",
-                                                                _1: (0).toPrecision(20)
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: "0.0000000000000000000",
+                                                          _1: (0).toPrecision(20)
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -299,11 +299,11 @@ var suites_1 = {
                                                       "File \"js_float_test.res\", line 68, characters 5-12",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "ThrowAny",
-                                                                  _0: (function (param) {
-                                                                      (0).toPrecision(101);
-                                                                    })
-                                                                };
+                                                            TAG: "ThrowAny",
+                                                            _0: (function (param) {
+                                                                (0).toPrecision(101);
+                                                              })
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -311,11 +311,11 @@ var suites_1 = {
                                                         "toPrecisionWithPrecision - digits:-1",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "ThrowAny",
-                                                                    _0: (function (param) {
-                                                                        (0).toPrecision(-1);
-                                                                      })
-                                                                  };
+                                                              TAG: "ThrowAny",
+                                                              _0: (function (param) {
+                                                                  (0).toPrecision(-1);
+                                                                })
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -323,10 +323,10 @@ var suites_1 = {
                                                           "toString",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: "1.23",
-                                                                      _1: (1.23).toString()
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: "1.23",
+                                                                _1: (1.23).toString()
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -334,10 +334,10 @@ var suites_1 = {
                                                             "toString - large number",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: "1.2e+21",
-                                                                        _1: (1.2e21).toString()
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: "1.2e+21",
+                                                                  _1: (1.2e21).toString()
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -345,10 +345,10 @@ var suites_1 = {
                                                               "toStringWithRadix - radix:2",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: "1111011.0111010010111100011010100111111011111001110111",
-                                                                          _1: (123.456).toString(2)
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: "1111011.0111010010111100011010100111111011111001110111",
+                                                                    _1: (123.456).toString(2)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -356,10 +356,10 @@ var suites_1 = {
                                                                 "toStringWithRadix - radix:16",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: "7b.74bc6a7ef9dc",
-                                                                            _1: (123.456).toString(16)
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: "7b.74bc6a7ef9dc",
+                                                                      _1: (123.456).toString(16)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -367,10 +367,10 @@ var suites_1 = {
                                                                   "toStringWithRadix - radix:36",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: "3f",
-                                                                              _1: (123).toString(36)
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: "3f",
+                                                                        _1: (123).toString(36)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -378,11 +378,11 @@ var suites_1 = {
                                                                     "toStringWithRadix - radix:37",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "ThrowAny",
-                                                                                _0: (function (param) {
-                                                                                    (0).toString(37);
-                                                                                  })
-                                                                              };
+                                                                          TAG: "ThrowAny",
+                                                                          _0: (function (param) {
+                                                                              (0).toString(37);
+                                                                            })
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -390,11 +390,11 @@ var suites_1 = {
                                                                       "toStringWithRadix - radix:1",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "ThrowAny",
-                                                                                  _0: (function (param) {
-                                                                                      (0).toString(1);
-                                                                                    })
-                                                                                };
+                                                                            TAG: "ThrowAny",
+                                                                            _0: (function (param) {
+                                                                                (0).toString(1);
+                                                                              })
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -402,11 +402,11 @@ var suites_1 = {
                                                                         "toStringWithRadix - radix:-1",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "ThrowAny",
-                                                                                    _0: (function (param) {
-                                                                                        (0).toString(-1);
-                                                                                      })
-                                                                                  };
+                                                                              TAG: "ThrowAny",
+                                                                              _0: (function (param) {
+                                                                                  (0).toString(-1);
+                                                                                })
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -414,10 +414,10 @@ var suites_1 = {
                                                                           "fromString - 123",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: 123,
-                                                                                      _1: Number("123")
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: 123,
+                                                                                _1: Number("123")
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -425,10 +425,10 @@ var suites_1 = {
                                                                             "fromString - 12.3",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 12.3,
-                                                                                        _1: Number("12.3")
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: 12.3,
+                                                                                  _1: Number("12.3")
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -436,10 +436,10 @@ var suites_1 = {
                                                                               "fromString - empty string",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 0,
-                                                                                          _1: Number("")
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: 0,
+                                                                                    _1: Number("")
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -447,10 +447,10 @@ var suites_1 = {
                                                                                 "fromString - 0x11",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 17,
-                                                                                            _1: Number("0x11")
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: 17,
+                                                                                      _1: Number("0x11")
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -458,10 +458,10 @@ var suites_1 = {
                                                                                   "fromString - 0b11",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 3,
-                                                                                              _1: Number("0b11")
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: 3,
+                                                                                        _1: Number("0b11")
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -469,10 +469,10 @@ var suites_1 = {
                                                                                     "fromString - 0o11",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 9,
-                                                                                                _1: Number("0o11")
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: 9,
+                                                                                          _1: Number("0o11")
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -480,10 +480,10 @@ var suites_1 = {
                                                                                       "fromString - invalid string",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: true,
-                                                                                                  _1: Number.isNaN(Number("foo"))
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: true,
+                                                                                            _1: Number.isNaN(Number("foo"))
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: /* [] */0
diff --git a/jscomp/test/js_global_test.js b/jscomp/test/js_global_test.js
index d1374ee40d1..c928236606b 100644
--- a/jscomp/test/js_global_test.js
+++ b/jscomp/test/js_global_test.js
@@ -11,9 +11,9 @@ var suites_0 = [
             }), 0);
       clearTimeout(handle);
       return {
-              TAG: "Ok",
-              _0: true
-            };
+        TAG: "Ok",
+        _0: true
+      };
     })
 ];
 
@@ -26,9 +26,9 @@ var suites_1 = {
               }), 0);
         clearInterval(handle);
         return {
-                TAG: "Ok",
-                _0: true
-              };
+          TAG: "Ok",
+          _0: true
+        };
       })
   ],
   tl: {
@@ -36,10 +36,10 @@ var suites_1 = {
       "encodeURI",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: encodeURI("[-=-]"),
-                  _1: "%5B-=-%5D"
-                };
+            TAG: "Eq",
+            _0: encodeURI("[-=-]"),
+            _1: "%5B-=-%5D"
+          };
         })
     ],
     tl: {
@@ -47,10 +47,10 @@ var suites_1 = {
         "decodeURI",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: decodeURI("%5B-=-%5D"),
-                    _1: "[-=-]"
-                  };
+              TAG: "Eq",
+              _0: decodeURI("%5B-=-%5D"),
+              _1: "[-=-]"
+            };
           })
       ],
       tl: {
@@ -58,10 +58,10 @@ var suites_1 = {
           "encodeURIComponent",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: encodeURIComponent("[-=-]"),
-                      _1: "%5B-%3D-%5D"
-                    };
+                TAG: "Eq",
+                _0: encodeURIComponent("[-=-]"),
+                _1: "%5B-%3D-%5D"
+              };
             })
         ],
         tl: {
@@ -69,10 +69,10 @@ var suites_1 = {
             "decodeURIComponent",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: decodeURIComponent("%5B-%3D-%5D"),
-                        _1: "[-=-]"
-                      };
+                  TAG: "Eq",
+                  _0: decodeURIComponent("%5B-%3D-%5D"),
+                  _1: "[-=-]"
+                };
               })
           ],
           tl: /* [] */0
diff --git a/jscomp/test/js_int_test.js b/jscomp/test/js_int_test.js
index 6c4766e687f..f54b577e3e0 100644
--- a/jscomp/test/js_int_test.js
+++ b/jscomp/test/js_int_test.js
@@ -7,10 +7,10 @@ var suites_0 = [
   "toExponential",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: "1.23456e+5",
-              _1: (123456).toExponential()
-            };
+        TAG: "Eq",
+        _0: "1.23456e+5",
+        _1: (123456).toExponential()
+      };
     })
 ];
 
@@ -19,10 +19,10 @@ var suites_1 = {
     "toExponentialWithPrecision - digits:2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: "1.23e+5",
-                _1: (123456).toExponential(2)
-              };
+          TAG: "Eq",
+          _0: "1.23e+5",
+          _1: (123456).toExponential(2)
+        };
       })
   ],
   tl: {
@@ -30,10 +30,10 @@ var suites_1 = {
       "toExponentialWithPrecision - digits:4",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: "1.2346e+5",
-                  _1: (123456).toExponential(4)
-                };
+            TAG: "Eq",
+            _0: "1.2346e+5",
+            _1: (123456).toExponential(4)
+          };
         })
     ],
     tl: {
@@ -41,10 +41,10 @@ var suites_1 = {
         "toExponentialWithPrecision - digits:20",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: "0.00000000000000000000e+0",
-                    _1: (0).toExponential(20)
-                  };
+              TAG: "Eq",
+              _0: "0.00000000000000000000e+0",
+              _1: (0).toExponential(20)
+            };
           })
       ],
       tl: {
@@ -52,11 +52,11 @@ var suites_1 = {
           "File \"js_int_test.res\", line 19, characters 5-12",
           (function (param) {
               return {
-                      TAG: "ThrowAny",
-                      _0: (function (param) {
-                          (0).toExponential(101);
-                        })
-                    };
+                TAG: "ThrowAny",
+                _0: (function (param) {
+                    (0).toExponential(101);
+                  })
+              };
             })
         ],
         tl: {
@@ -64,11 +64,11 @@ var suites_1 = {
             "toExponentialWithPrecision - digits:-1",
             (function (param) {
                 return {
-                        TAG: "ThrowAny",
-                        _0: (function (param) {
-                            (0).toExponential(-1);
-                          })
-                      };
+                  TAG: "ThrowAny",
+                  _0: (function (param) {
+                      (0).toExponential(-1);
+                    })
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ var suites_1 = {
               "toPrecision",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: "123456",
-                          _1: (123456).toPrecision()
-                        };
+                    TAG: "Eq",
+                    _0: "123456",
+                    _1: (123456).toPrecision()
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ var suites_1 = {
                 "toPrecisionWithPrecision - digits:2",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: "1.2e+5",
-                            _1: (123456).toPrecision(2)
-                          };
+                      TAG: "Eq",
+                      _0: "1.2e+5",
+                      _1: (123456).toPrecision(2)
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ var suites_1 = {
                   "toPrecisionWithPrecision - digits:4",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: "1.235e+5",
-                              _1: (123456).toPrecision(4)
-                            };
+                        TAG: "Eq",
+                        _0: "1.235e+5",
+                        _1: (123456).toPrecision(4)
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ var suites_1 = {
                     "toPrecisionWithPrecision - digits:20",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: "0.0000000000000000000",
-                                _1: (0).toPrecision(20)
-                              };
+                          TAG: "Eq",
+                          _0: "0.0000000000000000000",
+                          _1: (0).toPrecision(20)
+                        };
                       })
                   ],
                   tl: {
@@ -120,11 +120,11 @@ var suites_1 = {
                       "File \"js_int_test.res\", line 37, characters 5-12",
                       (function (param) {
                           return {
-                                  TAG: "ThrowAny",
-                                  _0: (function (param) {
-                                      (0).toPrecision(101);
-                                    })
-                                };
+                            TAG: "ThrowAny",
+                            _0: (function (param) {
+                                (0).toPrecision(101);
+                              })
+                          };
                         })
                     ],
                     tl: {
@@ -132,11 +132,11 @@ var suites_1 = {
                         "toPrecisionWithPrecision - digits:-1",
                         (function (param) {
                             return {
-                                    TAG: "ThrowAny",
-                                    _0: (function (param) {
-                                        (0).toPrecision(-1);
-                                      })
-                                  };
+                              TAG: "ThrowAny",
+                              _0: (function (param) {
+                                  (0).toPrecision(-1);
+                                })
+                            };
                           })
                       ],
                       tl: {
@@ -144,10 +144,10 @@ var suites_1 = {
                           "toString",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: "123",
-                                      _1: (123).toString()
-                                    };
+                                TAG: "Eq",
+                                _0: "123",
+                                _1: (123).toString()
+                              };
                             })
                         ],
                         tl: {
@@ -155,10 +155,10 @@ var suites_1 = {
                             "toStringWithRadix - radix:2",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: "11110001001000000",
-                                        _1: (123456).toString(2)
-                                      };
+                                  TAG: "Eq",
+                                  _0: "11110001001000000",
+                                  _1: (123456).toString(2)
+                                };
                               })
                           ],
                           tl: {
@@ -166,10 +166,10 @@ var suites_1 = {
                               "toStringWithRadix - radix:16",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: "1e240",
-                                          _1: (123456).toString(16)
-                                        };
+                                    TAG: "Eq",
+                                    _0: "1e240",
+                                    _1: (123456).toString(16)
+                                  };
                                 })
                             ],
                             tl: {
@@ -177,10 +177,10 @@ var suites_1 = {
                                 "toStringWithRadix - radix:36",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: "2n9c",
-                                            _1: (123456).toString(36)
-                                          };
+                                      TAG: "Eq",
+                                      _0: "2n9c",
+                                      _1: (123456).toString(36)
+                                    };
                                   })
                               ],
                               tl: {
@@ -188,11 +188,11 @@ var suites_1 = {
                                   "toStringWithRadix - radix:37",
                                   (function (param) {
                                       return {
-                                              TAG: "ThrowAny",
-                                              _0: (function (param) {
-                                                  (0).toString(37);
-                                                })
-                                            };
+                                        TAG: "ThrowAny",
+                                        _0: (function (param) {
+                                            (0).toString(37);
+                                          })
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -200,11 +200,11 @@ var suites_1 = {
                                     "toStringWithRadix - radix:1",
                                     (function (param) {
                                         return {
-                                                TAG: "ThrowAny",
-                                                _0: (function (param) {
-                                                    (0).toString(1);
-                                                  })
-                                              };
+                                          TAG: "ThrowAny",
+                                          _0: (function (param) {
+                                              (0).toString(1);
+                                            })
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -212,11 +212,11 @@ var suites_1 = {
                                       "toStringWithRadix - radix:-1",
                                       (function (param) {
                                           return {
-                                                  TAG: "ThrowAny",
-                                                  _0: (function (param) {
-                                                      (0).toString(-1);
-                                                    })
-                                                };
+                                            TAG: "ThrowAny",
+                                            _0: (function (param) {
+                                                (0).toString(-1);
+                                              })
+                                          };
                                         })
                                     ],
                                     tl: /* [] */0
diff --git a/jscomp/test/js_json_test.js b/jscomp/test/js_json_test.js
index 29fdc0e966e..e88a76d1557 100644
--- a/jscomp/test/js_json_test.js
+++ b/jscomp/test/js_json_test.js
@@ -33,28 +33,28 @@ function add_test(loc, test) {
 function eq(loc, x, y) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         }));
 }
 
 function false_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
 function true_(loc) {
   add_test(loc, (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: true
-                };
+            TAG: "Ok",
+            _0: true
+          };
         }));
 }
 
@@ -64,66 +64,66 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (para
         var ty = Js_json.classify(v);
         if (typeof ty !== "object") {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }
         if (ty.TAG !== "JSONObject") {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }
         var v$1 = Js_dict.get(ty._0, "x");
         if (v$1 === undefined) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }
         var ty2 = Js_json.classify(v$1);
         if (typeof ty2 !== "object") {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }
         if (ty2.TAG !== "JSONArray") {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }
         ty2._0.forEach(function (x) {
               var ty3 = Js_json.classify(x);
               if (typeof ty3 !== "object") {
                 throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "js_json_test.res",
-                        37,
-                        19
-                      ],
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: "Assert_failure",
+                  _1: [
+                    "js_json_test.res",
+                    37,
+                    19
+                  ],
+                  Error: new Error()
+                };
               }
               if (ty3.TAG === "JSONNumber") {
                 return;
               }
               throw {
-                    RE_EXN_ID: "Assert_failure",
-                    _1: [
-                      "js_json_test.res",
-                      37,
-                      19
-                    ],
-                    Error: new Error()
-                  };
+                RE_EXN_ID: "Assert_failure",
+                _1: [
+                  "js_json_test.res",
+                  37,
+                  19
+                ],
+                Error: new Error()
+              };
             });
         return {
-                TAG: "Ok",
-                _0: true
-              };
+          TAG: "Ok",
+          _0: true
+        };
       }));
 
 eq("File \"js_json_test.res\", line 48, characters 5-12", Js_json.test(v, "Object"), true);
@@ -136,26 +136,26 @@ if (typeof ty !== "object") {
   if (ty === "JSONNull") {
     add_test("File \"js_json_test.res\", line 55, characters 24-31", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: true
-                  };
+              TAG: "Ok",
+              _0: true
+            };
           }));
   } else {
     console.log(ty);
     add_test("File \"js_json_test.res\", line 58, characters 11-18", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: false
-                  };
+              TAG: "Ok",
+              _0: false
+            };
           }));
   }
 } else {
   console.log(ty);
   add_test("File \"js_json_test.res\", line 58, characters 11-18", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -166,18 +166,18 @@ var ty$1 = Js_json.classify(json$1);
 if (typeof ty$1 !== "object") {
   add_test("File \"js_json_test.res\", line 68, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            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");
 } else {
   add_test("File \"js_json_test.res\", line 68, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -196,9 +196,9 @@ if (typeof ty$2 !== "object" || ty$2.TAG !== "JSONNumber") {
 if (exit === 1) {
   add_test("File \"js_json_test.res\", line 78, characters 18-25", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -217,9 +217,9 @@ if (typeof ty$3 !== "object" || ty$3.TAG !== "JSONNumber") {
 if (exit$1 === 1) {
   add_test("File \"js_json_test.res\", line 88, characters 18-25", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -228,11 +228,11 @@ function test(v) {
   var ty = Js_json.classify(json);
   if (typeof ty === "object") {
     return add_test("File \"js_json_test.res\", line 100, characters 18-25", (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: "Ok",
+              _0: false
+            };
+          }));
   }
   switch (ty) {
     case "JSONFalse" :
@@ -241,11 +241,11 @@ function test(v) {
         return eq("File \"js_json_test.res\", line 98, characters 23-30", true, v);
     default:
       return add_test("File \"js_json_test.res\", line 100, characters 18-25", (function (param) {
-                    return {
-                            TAG: "Ok",
-                            _0: false
-                          };
-                  }));
+              return {
+                TAG: "Ok",
+                _0: false
+              };
+            }));
   }
 }
 
@@ -258,14 +258,14 @@ function option_get(x) {
     return Caml_option.valFromOption(x);
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "js_json_test.res",
-          111,
-          12
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "js_json_test.res",
+      111,
+      12
+    ],
+    Error: new Error()
+  };
 }
 
 var dict = {};
@@ -281,9 +281,9 @@ var ty$4 = Js_json.classify(json$4);
 if (typeof ty$4 !== "object") {
   add_test("File \"js_json_test.res\", line 142, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 } else if (ty$4.TAG === "JSONObject") {
   var x = ty$4._0;
@@ -291,59 +291,59 @@ if (typeof ty$4 !== "object") {
   if (typeof ta !== "object") {
     add_test("File \"js_json_test.res\", line 140, characters 18-25", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: false
-                  };
+              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", (function (param) {
               return {
-                      TAG: "Ok",
-                      _0: false
-                    };
+                TAG: "Ok",
+                _0: false
+              };
             }));
     } else {
       var 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", (function (param) {
                 return {
-                        TAG: "Ok",
-                        _0: false
-                      };
+                  TAG: "Ok",
+                  _0: false
+                };
               }));
       } else if (ty$5.TAG === "JSONNumber") {
         var b = ty$5._0;
         add_test("File \"js_json_test.res\", line 136, characters 38-45", (function (param) {
                 return {
-                        TAG: "Approx",
-                        _0: 123.0,
-                        _1: b
-                      };
+                  TAG: "Approx",
+                  _0: 123.0,
+                  _1: b
+                };
               }));
       } else {
         add_test("File \"js_json_test.res\", line 137, characters 22-29", (function (param) {
                 return {
-                        TAG: "Ok",
-                        _0: false
-                      };
+                  TAG: "Ok",
+                  _0: false
+                };
               }));
       }
     }
   } else {
     add_test("File \"js_json_test.res\", line 140, characters 18-25", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: false
-                  };
+              TAG: "Ok",
+              _0: false
+            };
           }));
   }
 } else {
   add_test("File \"js_json_test.res\", line 142, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -351,102 +351,102 @@ function eq_at_i(loc, json, i, kind, expected) {
   var ty = Js_json.classify(json);
   if (typeof ty !== "object") {
     return add_test(loc, (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: "Ok",
+              _0: false
+            };
+          }));
   }
   if (ty.TAG !== "JSONArray") {
     return add_test(loc, (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
+            return {
+              TAG: "Ok",
+              _0: false
+            };
+          }));
   }
   var ty$1 = Js_json.classify(Caml_array.get(ty._0, i));
   switch (kind) {
     case "String" :
         if (typeof ty$1 !== "object") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === "JSONString") {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
     case "Number" :
         if (typeof ty$1 !== "object") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === "JSONNumber") {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
     case "Object" :
         if (typeof ty$1 !== "object") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === "JSONObject") {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
     case "Array" :
         if (typeof ty$1 !== "object") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         } else if (ty$1.TAG === "JSONArray") {
           return eq(loc, ty$1._0, expected);
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
     case "Boolean" :
         if (typeof ty$1 === "object") {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
         switch (ty$1) {
           case "JSONFalse" :
@@ -455,36 +455,36 @@ function eq_at_i(loc, json, i, kind, expected) {
               return eq(loc, true, expected);
           default:
             return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: false
-                                };
-                        }));
+                    return {
+                      TAG: "Ok",
+                      _0: false
+                    };
+                  }));
         }
     case "Null" :
         if (typeof ty$1 !== "object") {
           if (ty$1 === "JSONNull") {
             return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: true
-                                };
-                        }));
+                    return {
+                      TAG: "Ok",
+                      _0: true
+                    };
+                  }));
           } else {
             return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: false
-                                };
-                        }));
+                    return {
+                      TAG: "Ok",
+                      _0: false
+                    };
+                  }));
           }
         } else {
           return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
+                  return {
+                    TAG: "Ok",
+                    _0: false
+                  };
+                }));
         }
     
   }
@@ -579,52 +579,52 @@ var ty$6 = Js_json.classify(json$10);
 if (typeof ty$6 !== "object") {
   add_test("File \"js_json_test.res\", line 271, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 } else if (ty$6.TAG === "JSONArray") {
   var 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", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: false
-                  };
+              TAG: "Ok",
+              _0: false
+            };
           }));
   } else if (ty$7.TAG === "JSONObject") {
     var 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", (function (param) {
               return {
-                      TAG: "Ok",
-                      _0: false
-                    };
+                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");
     } else {
       add_test("File \"js_json_test.res\", line 267, characters 20-27", (function (param) {
               return {
-                      TAG: "Ok",
-                      _0: false
-                    };
+                TAG: "Ok",
+                _0: false
+              };
             }));
     }
   } else {
     add_test("File \"js_json_test.res\", line 269, characters 18-25", (function (param) {
             return {
-                    TAG: "Ok",
-                    _0: false
-                  };
+              TAG: "Ok",
+              _0: false
+            };
           }));
   }
 } else {
   add_test("File \"js_json_test.res\", line 271, characters 16-23", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 
@@ -632,17 +632,17 @@ try {
   JSON.parse("{{ A}");
   add_test("File \"js_json_test.res\", line 279, characters 11-18", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: false
-                };
+            TAG: "Ok",
+            _0: false
+          };
         }));
 }
 catch (exn){
   add_test("File \"js_json_test.res\", line 281, characters 17-24", (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: true
-                };
+            TAG: "Ok",
+            _0: true
+          };
         }));
 }
 
diff --git a/jscomp/test/js_list_test.js b/jscomp/test/js_list_test.js
index 71ab15c520e..3a000f0c190 100644
--- a/jscomp/test/js_list_test.js
+++ b/jscomp/test/js_list_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -185,9 +185,9 @@ eq("File \"js_list_test.res\", line 31, characters 5-12", Js_list.countBy((funct
 
 var vv = Js_list.foldRight((function (x, y) {
         return {
-                hd: x,
-                tl: y
-              };
+          hd: x,
+          tl: y
+        };
       }), v, /* [] */0);
 
 eq("File \"js_list_test.res\", line 33, characters 5-12", true, Js_list.equal((function (x, y) {
diff --git a/jscomp/test/js_math_test.js b/jscomp/test/js_math_test.js
index 4eb628c2881..514952a0941 100644
--- a/jscomp/test/js_math_test.js
+++ b/jscomp/test/js_math_test.js
@@ -8,11 +8,11 @@ var suites_0 = [
   "_E",
   (function (param) {
       return {
-              TAG: "ApproxThreshold",
-              _0: 0.001,
-              _1: 2.718,
-              _2: Math.E
-            };
+        TAG: "ApproxThreshold",
+        _0: 0.001,
+        _1: 2.718,
+        _2: Math.E
+      };
     })
 ];
 
@@ -21,11 +21,11 @@ var suites_1 = {
     "_LN2",
     (function (param) {
         return {
-                TAG: "ApproxThreshold",
-                _0: 0.001,
-                _1: 0.693,
-                _2: Math.LN2
-              };
+          TAG: "ApproxThreshold",
+          _0: 0.001,
+          _1: 0.693,
+          _2: Math.LN2
+        };
       })
   ],
   tl: {
@@ -33,11 +33,11 @@ var suites_1 = {
       "_LN10",
       (function (param) {
           return {
-                  TAG: "ApproxThreshold",
-                  _0: 0.001,
-                  _1: 2.303,
-                  _2: Math.LN10
-                };
+            TAG: "ApproxThreshold",
+            _0: 0.001,
+            _1: 2.303,
+            _2: Math.LN10
+          };
         })
     ],
     tl: {
@@ -45,11 +45,11 @@ var suites_1 = {
         "_LOG2E",
         (function (param) {
             return {
-                    TAG: "ApproxThreshold",
-                    _0: 0.001,
-                    _1: 1.443,
-                    _2: Math.LOG2E
-                  };
+              TAG: "ApproxThreshold",
+              _0: 0.001,
+              _1: 1.443,
+              _2: Math.LOG2E
+            };
           })
       ],
       tl: {
@@ -57,11 +57,11 @@ var suites_1 = {
           "_LOG10E",
           (function (param) {
               return {
-                      TAG: "ApproxThreshold",
-                      _0: 0.001,
-                      _1: 0.434,
-                      _2: Math.LOG10E
-                    };
+                TAG: "ApproxThreshold",
+                _0: 0.001,
+                _1: 0.434,
+                _2: Math.LOG10E
+              };
             })
         ],
         tl: {
@@ -69,11 +69,11 @@ var suites_1 = {
             "_PI",
             (function (param) {
                 return {
-                        TAG: "ApproxThreshold",
-                        _0: 0.00001,
-                        _1: 3.14159,
-                        _2: Math.PI
-                      };
+                  TAG: "ApproxThreshold",
+                  _0: 0.00001,
+                  _1: 3.14159,
+                  _2: Math.PI
+                };
               })
           ],
           tl: {
@@ -81,11 +81,11 @@ var suites_1 = {
               "_SQRT1_2",
               (function (param) {
                   return {
-                          TAG: "ApproxThreshold",
-                          _0: 0.001,
-                          _1: 0.707,
-                          _2: Math.SQRT1_2
-                        };
+                    TAG: "ApproxThreshold",
+                    _0: 0.001,
+                    _1: 0.707,
+                    _2: Math.SQRT1_2
+                  };
                 })
             ],
             tl: {
@@ -93,11 +93,11 @@ var suites_1 = {
                 "_SQRT2",
                 (function (param) {
                     return {
-                            TAG: "ApproxThreshold",
-                            _0: 0.001,
-                            _1: 1.414,
-                            _2: Math.SQRT2
-                          };
+                      TAG: "ApproxThreshold",
+                      _0: 0.001,
+                      _1: 1.414,
+                      _2: Math.SQRT2
+                    };
                   })
               ],
               tl: {
@@ -105,10 +105,10 @@ var suites_1 = {
                   "abs_int",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: 4,
-                              _1: Math.abs(-4)
-                            };
+                        TAG: "Eq",
+                        _0: 4,
+                        _1: Math.abs(-4)
+                      };
                     })
                 ],
                 tl: {
@@ -116,10 +116,10 @@ var suites_1 = {
                     "abs_float",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: 1.2,
-                                _1: Math.abs(-1.2)
-                              };
+                          TAG: "Eq",
+                          _0: 1.2,
+                          _1: Math.abs(-1.2)
+                        };
                       })
                   ],
                   tl: {
@@ -127,11 +127,11 @@ var suites_1 = {
                       "acos",
                       (function (param) {
                           return {
-                                  TAG: "ApproxThreshold",
-                                  _0: 0.001,
-                                  _1: 1.159,
-                                  _2: Math.acos(0.4)
-                                };
+                            TAG: "ApproxThreshold",
+                            _0: 0.001,
+                            _1: 1.159,
+                            _2: Math.acos(0.4)
+                          };
                         })
                     ],
                     tl: {
@@ -139,11 +139,11 @@ var suites_1 = {
                         "acosh",
                         (function (param) {
                             return {
-                                    TAG: "ApproxThreshold",
-                                    _0: 0.001,
-                                    _1: 0.622,
-                                    _2: Math.acosh(1.2)
-                                  };
+                              TAG: "ApproxThreshold",
+                              _0: 0.001,
+                              _1: 0.622,
+                              _2: Math.acosh(1.2)
+                            };
                           })
                       ],
                       tl: {
@@ -151,11 +151,11 @@ var suites_1 = {
                           "asin",
                           (function (param) {
                               return {
-                                      TAG: "ApproxThreshold",
-                                      _0: 0.001,
-                                      _1: 0.411,
-                                      _2: Math.asin(0.4)
-                                    };
+                                TAG: "ApproxThreshold",
+                                _0: 0.001,
+                                _1: 0.411,
+                                _2: Math.asin(0.4)
+                              };
                             })
                         ],
                         tl: {
@@ -163,11 +163,11 @@ var suites_1 = {
                             "asinh",
                             (function (param) {
                                 return {
-                                        TAG: "ApproxThreshold",
-                                        _0: 0.001,
-                                        _1: 0.390,
-                                        _2: Math.asinh(0.4)
-                                      };
+                                  TAG: "ApproxThreshold",
+                                  _0: 0.001,
+                                  _1: 0.390,
+                                  _2: Math.asinh(0.4)
+                                };
                               })
                           ],
                           tl: {
@@ -175,11 +175,11 @@ var suites_1 = {
                               "atan",
                               (function (param) {
                                   return {
-                                          TAG: "ApproxThreshold",
-                                          _0: 0.001,
-                                          _1: 0.380,
-                                          _2: Math.atan(0.4)
-                                        };
+                                    TAG: "ApproxThreshold",
+                                    _0: 0.001,
+                                    _1: 0.380,
+                                    _2: Math.atan(0.4)
+                                  };
                                 })
                             ],
                             tl: {
@@ -187,11 +187,11 @@ var suites_1 = {
                                 "atanh",
                                 (function (param) {
                                     return {
-                                            TAG: "ApproxThreshold",
-                                            _0: 0.001,
-                                            _1: 0.423,
-                                            _2: Math.atanh(0.4)
-                                          };
+                                      TAG: "ApproxThreshold",
+                                      _0: 0.001,
+                                      _1: 0.423,
+                                      _2: Math.atanh(0.4)
+                                    };
                                   })
                               ],
                               tl: {
@@ -199,11 +199,11 @@ var suites_1 = {
                                   "atan2",
                                   (function (param) {
                                       return {
-                                              TAG: "ApproxThreshold",
-                                              _0: 0.001,
-                                              _1: 0.588,
-                                              _2: Math.atan2(0.4, 0.6)
-                                            };
+                                        TAG: "ApproxThreshold",
+                                        _0: 0.001,
+                                        _1: 0.588,
+                                        _2: Math.atan2(0.4, 0.6)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -211,10 +211,10 @@ var suites_1 = {
                                     "cbrt",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: 2,
-                                                _1: Math.cbrt(8)
-                                              };
+                                          TAG: "Eq",
+                                          _0: 2,
+                                          _1: Math.cbrt(8)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -222,10 +222,10 @@ var suites_1 = {
                                       "unsafe_ceil_int",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: 4,
-                                                  _1: Math.ceil(3.2)
-                                                };
+                                            TAG: "Eq",
+                                            _0: 4,
+                                            _1: Math.ceil(3.2)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -233,10 +233,10 @@ var suites_1 = {
                                         "ceil_int",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: 4,
-                                                    _1: Js_math.ceil_int(3.2)
-                                                  };
+                                              TAG: "Eq",
+                                              _0: 4,
+                                              _1: Js_math.ceil_int(3.2)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -244,10 +244,10 @@ var suites_1 = {
                                           "ceil_float",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: 4,
-                                                      _1: Math.ceil(3.2)
-                                                    };
+                                                TAG: "Eq",
+                                                _0: 4,
+                                                _1: Math.ceil(3.2)
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -255,11 +255,11 @@ var suites_1 = {
                                             "cos",
                                             (function (param) {
                                                 return {
-                                                        TAG: "ApproxThreshold",
-                                                        _0: 0.001,
-                                                        _1: 0.921,
-                                                        _2: Math.cos(0.4)
-                                                      };
+                                                  TAG: "ApproxThreshold",
+                                                  _0: 0.001,
+                                                  _1: 0.921,
+                                                  _2: Math.cos(0.4)
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -267,11 +267,11 @@ var suites_1 = {
                                               "cosh",
                                               (function (param) {
                                                   return {
-                                                          TAG: "ApproxThreshold",
-                                                          _0: 0.001,
-                                                          _1: 1.081,
-                                                          _2: Math.cosh(0.4)
-                                                        };
+                                                    TAG: "ApproxThreshold",
+                                                    _0: 0.001,
+                                                    _1: 1.081,
+                                                    _2: Math.cosh(0.4)
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -279,11 +279,11 @@ var suites_1 = {
                                                 "exp",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "ApproxThreshold",
-                                                            _0: 0.001,
-                                                            _1: 1.491,
-                                                            _2: Math.exp(0.4)
-                                                          };
+                                                      TAG: "ApproxThreshold",
+                                                      _0: 0.001,
+                                                      _1: 1.491,
+                                                      _2: Math.exp(0.4)
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -291,11 +291,11 @@ var suites_1 = {
                                                   "expm1",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "ApproxThreshold",
-                                                              _0: 0.001,
-                                                              _1: 0.491,
-                                                              _2: Math.expm1(0.4)
-                                                            };
+                                                        TAG: "ApproxThreshold",
+                                                        _0: 0.001,
+                                                        _1: 0.491,
+                                                        _2: Math.expm1(0.4)
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -303,10 +303,10 @@ var suites_1 = {
                                                     "unsafe_floor_int",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: 3,
-                                                                _1: Math.floor(3.2)
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: 3,
+                                                          _1: Math.floor(3.2)
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -314,10 +314,10 @@ var suites_1 = {
                                                       "floor_int",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: 3,
-                                                                  _1: Js_math.floor_int(3.2)
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: 3,
+                                                            _1: Js_math.floor_int(3.2)
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -325,10 +325,10 @@ var suites_1 = {
                                                         "floor_float",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: 3,
-                                                                    _1: Math.floor(3.2)
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: 3,
+                                                              _1: Math.floor(3.2)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -336,10 +336,10 @@ var suites_1 = {
                                                           "fround",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Approx",
-                                                                      _0: 3.2,
-                                                                      _1: Math.fround(3.2)
-                                                                    };
+                                                                TAG: "Approx",
+                                                                _0: 3.2,
+                                                                _1: Math.fround(3.2)
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -347,11 +347,11 @@ var suites_1 = {
                                                             "hypot",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "ApproxThreshold",
-                                                                        _0: 0.001,
-                                                                        _1: 0.721,
-                                                                        _2: Math.hypot(0.4, 0.6)
-                                                                      };
+                                                                  TAG: "ApproxThreshold",
+                                                                  _0: 0.001,
+                                                                  _1: 0.721,
+                                                                  _2: Math.hypot(0.4, 0.6)
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -359,11 +359,11 @@ var suites_1 = {
                                                               "hypotMany",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "ApproxThreshold",
-                                                                          _0: 0.001,
-                                                                          _1: 1.077,
-                                                                          _2: Math.hypot(0.4, 0.6, 0.8)
-                                                                        };
+                                                                    TAG: "ApproxThreshold",
+                                                                    _0: 0.001,
+                                                                    _1: 1.077,
+                                                                    _2: Math.hypot(0.4, 0.6, 0.8)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -371,10 +371,10 @@ var suites_1 = {
                                                                 "imul",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: 8,
-                                                                            _1: Math.imul(4, 2)
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: 8,
+                                                                      _1: Math.imul(4, 2)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -382,11 +382,11 @@ var suites_1 = {
                                                                   "log",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "ApproxThreshold",
-                                                                              _0: 0.001,
-                                                                              _1: -0.916,
-                                                                              _2: Math.log(0.4)
-                                                                            };
+                                                                        TAG: "ApproxThreshold",
+                                                                        _0: 0.001,
+                                                                        _1: -0.916,
+                                                                        _2: Math.log(0.4)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -394,11 +394,11 @@ var suites_1 = {
                                                                     "log1p",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "ApproxThreshold",
-                                                                                _0: 0.001,
-                                                                                _1: 0.336,
-                                                                                _2: Math.log1p(0.4)
-                                                                              };
+                                                                          TAG: "ApproxThreshold",
+                                                                          _0: 0.001,
+                                                                          _1: 0.336,
+                                                                          _2: Math.log1p(0.4)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -406,11 +406,11 @@ var suites_1 = {
                                                                       "log10",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "ApproxThreshold",
-                                                                                  _0: 0.001,
-                                                                                  _1: -0.397,
-                                                                                  _2: Math.log10(0.4)
-                                                                                };
+                                                                            TAG: "ApproxThreshold",
+                                                                            _0: 0.001,
+                                                                            _1: -0.397,
+                                                                            _2: Math.log10(0.4)
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -418,11 +418,11 @@ var suites_1 = {
                                                                         "log2",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "ApproxThreshold",
-                                                                                    _0: 0.001,
-                                                                                    _1: -1.321,
-                                                                                    _2: Math.log2(0.4)
-                                                                                  };
+                                                                              TAG: "ApproxThreshold",
+                                                                              _0: 0.001,
+                                                                              _1: -1.321,
+                                                                              _2: Math.log2(0.4)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -430,10 +430,10 @@ var suites_1 = {
                                                                           "max_int",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: 4,
-                                                                                      _1: Math.max(2, 4)
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: 4,
+                                                                                _1: Math.max(2, 4)
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -441,10 +441,10 @@ var suites_1 = {
                                                                             "maxMany_int",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 4,
-                                                                                        _1: Math.max(2, 4, 3)
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: 4,
+                                                                                  _1: Math.max(2, 4, 3)
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -452,10 +452,10 @@ var suites_1 = {
                                                                               "max_float",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 4.2,
-                                                                                          _1: Math.max(2.7, 4.2)
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: 4.2,
+                                                                                    _1: Math.max(2.7, 4.2)
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -463,10 +463,10 @@ var suites_1 = {
                                                                                 "maxMany_float",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 4.2,
-                                                                                            _1: Math.max(2.7, 4.2, 3.9)
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: 4.2,
+                                                                                      _1: Math.max(2.7, 4.2, 3.9)
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -474,10 +474,10 @@ var suites_1 = {
                                                                                   "min_int",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 2,
-                                                                                              _1: Math.min(2, 4)
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: 2,
+                                                                                        _1: Math.min(2, 4)
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -485,10 +485,10 @@ var suites_1 = {
                                                                                     "minMany_int",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 2,
-                                                                                                _1: Math.min(2, 4, 3)
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: 2,
+                                                                                          _1: Math.min(2, 4, 3)
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -496,10 +496,10 @@ var suites_1 = {
                                                                                       "min_float",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: 2.7,
-                                                                                                  _1: Math.min(2.7, 4.2)
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: 2.7,
+                                                                                            _1: Math.min(2.7, 4.2)
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -507,10 +507,10 @@ var suites_1 = {
                                                                                         "minMany_float",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 2.7,
-                                                                                                    _1: Math.min(2.7, 4.2, 3.9)
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: 2.7,
+                                                                                              _1: Math.min(2.7, 4.2, 3.9)
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -519,9 +519,9 @@ var suites_1 = {
                                                                                           (function (param) {
                                                                                               var a = Math.random();
                                                                                               return {
-                                                                                                      TAG: "Ok",
-                                                                                                      _0: a >= 0 && a < 1
-                                                                                                    };
+                                                                                                TAG: "Ok",
+                                                                                                _0: a >= 0 && a < 1
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -530,9 +530,9 @@ var suites_1 = {
                                                                                             (function (param) {
                                                                                                 var a = Js_math.random_int(1, 3);
                                                                                                 return {
-                                                                                                        TAG: "Ok",
-                                                                                                        _0: a >= 1 && a < 3
-                                                                                                      };
+                                                                                                  TAG: "Ok",
+                                                                                                  _0: a >= 1 && a < 3
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -540,10 +540,10 @@ var suites_1 = {
                                                                                               "unsafe_round",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 3,
-                                                                                                          _1: Math.round(3.2)
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: 3,
+                                                                                                    _1: Math.round(3.2)
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -551,10 +551,10 @@ var suites_1 = {
                                                                                                 "round",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: 3,
-                                                                                                            _1: Math.round(3.2)
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: 3,
+                                                                                                      _1: Math.round(3.2)
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -562,10 +562,10 @@ var suites_1 = {
                                                                                                   "sign_int",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: -1,
-                                                                                                              _1: Math.sign(-4)
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: -1,
+                                                                                                        _1: Math.sign(-4)
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -573,10 +573,10 @@ var suites_1 = {
                                                                                                     "sign_float",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: -1,
-                                                                                                                _1: Math.sign(-4.2)
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: -1,
+                                                                                                          _1: Math.sign(-4.2)
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -584,10 +584,10 @@ var suites_1 = {
                                                                                                       "sign_float -0",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: -0,
-                                                                                                                  _1: Math.sign(-0)
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: -0,
+                                                                                                            _1: Math.sign(-0)
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -595,11 +595,11 @@ var suites_1 = {
                                                                                                         "sin",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: "ApproxThreshold",
-                                                                                                                    _0: 0.001,
-                                                                                                                    _1: 0.389,
-                                                                                                                    _2: Math.sin(0.4)
-                                                                                                                  };
+                                                                                                              TAG: "ApproxThreshold",
+                                                                                                              _0: 0.001,
+                                                                                                              _1: 0.389,
+                                                                                                              _2: Math.sin(0.4)
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -607,11 +607,11 @@ var suites_1 = {
                                                                                                           "sinh",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: "ApproxThreshold",
-                                                                                                                      _0: 0.001,
-                                                                                                                      _1: 0.410,
-                                                                                                                      _2: Math.sinh(0.4)
-                                                                                                                    };
+                                                                                                                TAG: "ApproxThreshold",
+                                                                                                                _0: 0.001,
+                                                                                                                _1: 0.410,
+                                                                                                                _2: Math.sinh(0.4)
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -619,11 +619,11 @@ var suites_1 = {
                                                                                                             "sqrt",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: "ApproxThreshold",
-                                                                                                                        _0: 0.001,
-                                                                                                                        _1: 0.632,
-                                                                                                                        _2: Math.sqrt(0.4)
-                                                                                                                      };
+                                                                                                                  TAG: "ApproxThreshold",
+                                                                                                                  _0: 0.001,
+                                                                                                                  _1: 0.632,
+                                                                                                                  _2: Math.sqrt(0.4)
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -631,11 +631,11 @@ var suites_1 = {
                                                                                                               "tan",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: "ApproxThreshold",
-                                                                                                                          _0: 0.001,
-                                                                                                                          _1: 0.422,
-                                                                                                                          _2: Math.tan(0.4)
-                                                                                                                        };
+                                                                                                                    TAG: "ApproxThreshold",
+                                                                                                                    _0: 0.001,
+                                                                                                                    _1: 0.422,
+                                                                                                                    _2: Math.tan(0.4)
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -643,11 +643,11 @@ var suites_1 = {
                                                                                                                 "tanh",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: "ApproxThreshold",
-                                                                                                                            _0: 0.001,
-                                                                                                                            _1: 0.379,
-                                                                                                                            _2: Math.tanh(0.4)
-                                                                                                                          };
+                                                                                                                      TAG: "ApproxThreshold",
+                                                                                                                      _0: 0.001,
+                                                                                                                      _1: 0.379,
+                                                                                                                      _2: Math.tanh(0.4)
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -655,10 +655,10 @@ var suites_1 = {
                                                                                                                   "unsafe_trunc",
                                                                                                                   (function (param) {
                                                                                                                       return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 4,
-                                                                                                                              _1: Math.trunc(4.2156)
-                                                                                                                            };
+                                                                                                                        TAG: "Eq",
+                                                                                                                        _0: 4,
+                                                                                                                        _1: Math.trunc(4.2156)
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -666,10 +666,10 @@ var suites_1 = {
                                                                                                                     "trunc",
                                                                                                                     (function (param) {
                                                                                                                         return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: 4,
-                                                                                                                                _1: Math.trunc(4.2156)
-                                                                                                                              };
+                                                                                                                          TAG: "Eq",
+                                                                                                                          _0: 4,
+                                                                                                                          _1: Math.trunc(4.2156)
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: /* [] */0
diff --git a/jscomp/test/js_null_test.js b/jscomp/test/js_null_test.js
index 2143ef0a8e0..fc571752d2d 100644
--- a/jscomp/test/js_null_test.js
+++ b/jscomp/test/js_null_test.js
@@ -9,10 +9,10 @@ var suites_0 = [
   "toOption - empty",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: "Eq",
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ var suites_1 = {
     "toOption - 'a",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: Caml_option.some(undefined),
-                _1: Caml_option.some()
-              };
+          TAG: "Eq",
+          _0: Caml_option.some(undefined),
+          _1: Caml_option.some()
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ var suites_1 = {
       "return",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: "something",
-                  _1: Caml_option.null_to_opt("something")
-                };
+            TAG: "Eq",
+            _0: "something",
+            _1: Caml_option.null_to_opt("something")
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ var suites_1 = {
         "test - empty",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: true
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
           "test - 'a",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: false,
-                      _1: false
-                    };
+                TAG: "Eq",
+                _0: false,
+                _1: false
+              };
             })
         ],
         tl: {
@@ -65,12 +65,12 @@ var suites_1 = {
             "bind - empty",
             (function (param) {
                 return {
-                        TAG: "StrictEq",
-                        _0: null,
-                        _1: Js_null.bind(null, (function (v) {
-                                return v;
-                              }))
-                      };
+                  TAG: "StrictEq",
+                  _0: null,
+                  _1: Js_null.bind(null, (function (v) {
+                          return v;
+                        }))
+                };
               })
           ],
           tl: {
@@ -78,12 +78,12 @@ var suites_1 = {
               "bind - 'a",
               (function (param) {
                   return {
-                          TAG: "StrictEq",
-                          _0: 4,
-                          _1: Js_null.bind(2, (function (n) {
-                                  return (n << 1);
-                                }))
-                        };
+                    TAG: "StrictEq",
+                    _0: 4,
+                    _1: Js_null.bind(2, (function (n) {
+                            return (n << 1);
+                          }))
+                  };
                 })
             ],
             tl: {
@@ -97,10 +97,10 @@ var suites_1 = {
                             hit.contents = true;
                           }));
                     return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: hit.contents
-                          };
+                      TAG: "Eq",
+                      _0: false,
+                      _1: hit.contents
+                    };
                   })
               ],
               tl: {
@@ -114,10 +114,10 @@ var suites_1 = {
                               hit.contents = v;
                             }));
                       return {
-                              TAG: "Eq",
-                              _0: 2,
-                              _1: hit.contents
-                            };
+                        TAG: "Eq",
+                        _0: 2,
+                        _1: hit.contents
+                      };
                     })
                 ],
                 tl: {
@@ -125,10 +125,10 @@ var suites_1 = {
                     "fromOption - None",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: null,
-                                _1: Js_null.fromOption(undefined)
-                              };
+                          TAG: "Eq",
+                          _0: null,
+                          _1: Js_null.fromOption(undefined)
+                        };
                       })
                   ],
                   tl: {
@@ -136,10 +136,10 @@ var suites_1 = {
                       "fromOption - Some",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: 2,
-                                  _1: Js_null.fromOption(2)
-                                };
+                            TAG: "Eq",
+                            _0: 2,
+                            _1: Js_null.fromOption(2)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/js_null_undefined_test.js b/jscomp/test/js_null_undefined_test.js
index 6be2c755103..c7993e4264c 100644
--- a/jscomp/test/js_null_undefined_test.js
+++ b/jscomp/test/js_null_undefined_test.js
@@ -9,10 +9,10 @@ var suites_0 = [
   "toOption - null",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: "Eq",
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ var suites_1 = {
     "toOption - undefined",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: undefined,
-                _1: undefined
-              };
+          TAG: "Eq",
+          _0: undefined,
+          _1: undefined
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ var suites_1 = {
       "toOption - empty",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: undefined,
-                  _1: undefined
-                };
+            TAG: "Eq",
+            _0: undefined,
+            _1: undefined
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ var suites_1 = {
         "File \"js_null_undefined_test.res\", line 9, characters 5-12",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: "foo",
-                    _1: Caml_option.nullable_to_opt("foo")
-                  };
+              TAG: "Eq",
+              _0: "foo",
+              _1: Caml_option.nullable_to_opt("foo")
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
           "return",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: "something",
-                      _1: Caml_option.nullable_to_opt("something")
-                    };
+                TAG: "Eq",
+                _0: "something",
+                _1: Caml_option.nullable_to_opt("something")
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ var suites_1 = {
             "test - null",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: true
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: true
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ var suites_1 = {
               "test - undefined",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: true
-                        };
+                    TAG: "Eq",
+                    _0: true,
+                    _1: true
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ var suites_1 = {
                 "test - empty",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: true
-                          };
+                      TAG: "Eq",
+                      _0: true,
+                      _1: true
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ var suites_1 = {
                   "File \"js_null_undefined_test.res\", line 14, characters 5-12",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: true
-                            };
+                        TAG: "Eq",
+                        _0: true,
+                        _1: true
+                      };
                     })
                 ],
                 tl: {
@@ -109,12 +109,12 @@ var suites_1 = {
                     "bind - null",
                     (function (param) {
                         return {
-                                TAG: "StrictEq",
-                                _0: null,
-                                _1: Js_null_undefined.bind(null, (function (v) {
-                                        return v;
-                                      }))
-                              };
+                          TAG: "StrictEq",
+                          _0: null,
+                          _1: Js_null_undefined.bind(null, (function (v) {
+                                  return v;
+                                }))
+                        };
                       })
                   ],
                   tl: {
@@ -122,12 +122,12 @@ var suites_1 = {
                       "bind - undefined",
                       (function (param) {
                           return {
-                                  TAG: "StrictEq",
-                                  _0: undefined,
-                                  _1: Js_null_undefined.bind(undefined, (function (v) {
-                                          return v;
-                                        }))
-                                };
+                            TAG: "StrictEq",
+                            _0: undefined,
+                            _1: Js_null_undefined.bind(undefined, (function (v) {
+                                    return v;
+                                  }))
+                          };
                         })
                     ],
                     tl: {
@@ -135,12 +135,12 @@ var suites_1 = {
                         "bind - empty",
                         (function (param) {
                             return {
-                                    TAG: "StrictEq",
-                                    _0: undefined,
-                                    _1: Js_null_undefined.bind(undefined, (function (v) {
-                                            return v;
-                                          }))
-                                  };
+                              TAG: "StrictEq",
+                              _0: undefined,
+                              _1: Js_null_undefined.bind(undefined, (function (v) {
+                                      return v;
+                                    }))
+                            };
                           })
                       ],
                       tl: {
@@ -148,12 +148,12 @@ var suites_1 = {
                           "bind - 'a",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: 4,
-                                      _1: Js_null_undefined.bind(2, (function (n) {
-                                              return (n << 1);
-                                            }))
-                                    };
+                                TAG: "Eq",
+                                _0: 4,
+                                _1: Js_null_undefined.bind(2, (function (n) {
+                                        return (n << 1);
+                                      }))
+                              };
                             })
                         ],
                         tl: {
@@ -167,10 +167,10 @@ var suites_1 = {
                                         hit.contents = true;
                                       }));
                                 return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: hit.contents
-                                      };
+                                  TAG: "Eq",
+                                  _0: false,
+                                  _1: hit.contents
+                                };
                               })
                           ],
                           tl: {
@@ -184,10 +184,10 @@ var suites_1 = {
                                           hit.contents = true;
                                         }));
                                   return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: hit.contents
-                                        };
+                                    TAG: "Eq",
+                                    _0: false,
+                                    _1: hit.contents
+                                  };
                                 })
                             ],
                             tl: {
@@ -201,10 +201,10 @@ var suites_1 = {
                                             hit.contents = true;
                                           }));
                                     return {
-                                            TAG: "Eq",
-                                            _0: false,
-                                            _1: hit.contents
-                                          };
+                                      TAG: "Eq",
+                                      _0: false,
+                                      _1: hit.contents
+                                    };
                                   })
                               ],
                               tl: {
@@ -218,10 +218,10 @@ var suites_1 = {
                                               hit.contents = v;
                                             }));
                                       return {
-                                              TAG: "Eq",
-                                              _0: 2,
-                                              _1: hit.contents
-                                            };
+                                        TAG: "Eq",
+                                        _0: 2,
+                                        _1: hit.contents
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -229,10 +229,10 @@ var suites_1 = {
                                     "fromOption - None",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: undefined,
-                                                _1: Js_null_undefined.fromOption(undefined)
-                                              };
+                                          TAG: "Eq",
+                                          _0: undefined,
+                                          _1: Js_null_undefined.fromOption(undefined)
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -240,10 +240,10 @@ var suites_1 = {
                                       "fromOption - Some",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: 2,
-                                                  _1: Js_null_undefined.fromOption(2)
-                                                };
+                                            TAG: "Eq",
+                                            _0: 2,
+                                            _1: Js_null_undefined.fromOption(2)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -251,9 +251,9 @@ var suites_1 = {
                                         "null <> undefined",
                                         (function (param) {
                                             return {
-                                                    TAG: "Ok",
-                                                    _0: true
-                                                  };
+                                              TAG: "Ok",
+                                              _0: true
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -261,9 +261,9 @@ var suites_1 = {
                                           "null <> empty",
                                           (function (param) {
                                               return {
-                                                      TAG: "Ok",
-                                                      _0: true
-                                                    };
+                                                TAG: "Ok",
+                                                _0: true
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -271,9 +271,9 @@ var suites_1 = {
                                             "undefined = empty",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Ok",
-                                                        _0: true
-                                                      };
+                                                  TAG: "Ok",
+                                                  _0: true
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -281,9 +281,9 @@ var suites_1 = {
                                               "File \"js_null_undefined_test.res\", line 57, characters 6-13",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Ok",
-                                                          _0: true
-                                                        };
+                                                    TAG: "Ok",
+                                                    _0: true
+                                                  };
                                                 })
                                             ],
                                             tl: /* [] */0
diff --git a/jscomp/test/js_nullable_test.js b/jscomp/test/js_nullable_test.js
index 10dca58c44b..a1c2f25dd26 100644
--- a/jscomp/test/js_nullable_test.js
+++ b/jscomp/test/js_nullable_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/js_obj_test.js b/jscomp/test/js_obj_test.js
index b256d7fe73a..ed49b1dcb16 100644
--- a/jscomp/test/js_obj_test.js
+++ b/jscomp/test/js_obj_test.js
@@ -7,10 +7,10 @@ var suites_0 = [
   "empty",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 0,
-              _1: Object.keys({}).length
-            };
+        TAG: "Eq",
+        _0: 0,
+        _1: Object.keys({}).length
+      };
     })
 ];
 
@@ -19,14 +19,14 @@ var suites_1 = {
     "assign",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: {
-                  a: 1
-                },
-                _1: Object.assign({}, {
-                      a: 1
-                    })
-              };
+          TAG: "Eq",
+          _0: {
+            a: 1
+          },
+          _1: Object.assign({}, {
+                a: 1
+              })
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/js_option_test.js b/jscomp/test/js_option_test.js
index a5b1571e019..9e0d20bc4b7 100644
--- a/jscomp/test/js_option_test.js
+++ b/jscomp/test/js_option_test.js
@@ -12,10 +12,10 @@ var option_suites_0 = [
   "option_isSome_Some",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: true,
-              _1: true
-            };
+        TAG: "Eq",
+        _0: true,
+        _1: true
+      };
     })
 ];
 
@@ -24,10 +24,10 @@ var option_suites_1 = {
     "option_isSome_None",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: false,
-                _1: false
-              };
+          TAG: "Eq",
+          _0: false,
+          _1: false
+        };
       })
   ],
   tl: {
@@ -35,10 +35,10 @@ var option_suites_1 = {
       "option_isNone_Some",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: false,
-                  _1: false
-                };
+            TAG: "Eq",
+            _0: false,
+            _1: false
+          };
         })
     ],
     tl: {
@@ -46,10 +46,10 @@ var option_suites_1 = {
         "option_isNone_None",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: true
+            };
           })
       ],
       tl: {
@@ -57,10 +57,10 @@ var option_suites_1 = {
           "option_isSomeValue_Eq",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Js_option.isSomeValue(simpleEq, 2, 2)
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: Js_option.isSomeValue(simpleEq, 2, 2)
+              };
             })
         ],
         tl: {
@@ -68,10 +68,10 @@ var option_suites_1 = {
             "option_isSomeValue_Diff",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Js_option.isSomeValue(simpleEq, 1, 2)
-                      };
+                  TAG: "Eq",
+                  _0: false,
+                  _1: Js_option.isSomeValue(simpleEq, 1, 2)
+                };
               })
           ],
           tl: {
@@ -79,10 +79,10 @@ var option_suites_1 = {
               "option_isSomeValue_DiffNone",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: false,
-                          _1: Js_option.isSomeValue(simpleEq, 1, undefined)
-                        };
+                    TAG: "Eq",
+                    _0: false,
+                    _1: Js_option.isSomeValue(simpleEq, 1, undefined)
+                  };
                 })
             ],
             tl: {
@@ -90,10 +90,10 @@ var option_suites_1 = {
                 "option_getExn_Some",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: 2,
-                            _1: Js_option.getExn(2)
-                          };
+                      TAG: "Eq",
+                      _0: 2,
+                      _1: Js_option.getExn(2)
+                    };
                   })
               ],
               tl: {
@@ -101,10 +101,10 @@ var option_suites_1 = {
                   "option_equal_Eq",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Js_option.equal(simpleEq, 2, 2)
-                            };
+                        TAG: "Eq",
+                        _0: true,
+                        _1: Js_option.equal(simpleEq, 2, 2)
+                      };
                     })
                 ],
                 tl: {
@@ -112,10 +112,10 @@ var option_suites_1 = {
                     "option_equal_Diff",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: false,
-                                _1: Js_option.equal(simpleEq, 1, 2)
-                              };
+                          TAG: "Eq",
+                          _0: false,
+                          _1: Js_option.equal(simpleEq, 1, 2)
+                        };
                       })
                   ],
                   tl: {
@@ -123,10 +123,10 @@ var option_suites_1 = {
                       "option_equal_DiffNone",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: false,
-                                  _1: Js_option.equal(simpleEq, 1, undefined)
-                                };
+                            TAG: "Eq",
+                            _0: false,
+                            _1: Js_option.equal(simpleEq, 1, undefined)
+                          };
                         })
                     ],
                     tl: {
@@ -134,12 +134,12 @@ var option_suites_1 = {
                         "option_andThen_SomeSome",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: true,
-                                    _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (a) {
-                                                return a + 1 | 0;
-                                              }), 2))
-                                  };
+                              TAG: "Eq",
+                              _0: true,
+                              _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (a) {
+                                          return a + 1 | 0;
+                                        }), 2))
+                            };
                           })
                       ],
                       tl: {
@@ -147,12 +147,12 @@ var option_suites_1 = {
                           "option_andThen_SomeNone",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: false,
-                                      _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (param) {
-                                                  
-                                                }), 2))
-                                    };
+                                TAG: "Eq",
+                                _0: false,
+                                _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (param) {
+                                            
+                                          }), 2))
+                              };
                             })
                         ],
                         tl: {
@@ -160,12 +160,12 @@ var option_suites_1 = {
                             "option_map_Some",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: Js_option.isSomeValue(simpleEq, 3, Js_option.map((function (a) {
-                                                    return a + 1 | 0;
-                                                  }), 2))
-                                      };
+                                  TAG: "Eq",
+                                  _0: true,
+                                  _1: Js_option.isSomeValue(simpleEq, 3, Js_option.map((function (a) {
+                                              return a + 1 | 0;
+                                            }), 2))
+                                };
                               })
                           ],
                           tl: {
@@ -173,12 +173,12 @@ var option_suites_1 = {
                               "option_map_None",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: undefined,
-                                          _1: Js_option.map((function (a) {
-                                                  return a + 1 | 0;
-                                                }), undefined)
-                                        };
+                                    TAG: "Eq",
+                                    _0: undefined,
+                                    _1: Js_option.map((function (a) {
+                                            return a + 1 | 0;
+                                          }), undefined)
+                                  };
                                 })
                             ],
                             tl: {
@@ -186,10 +186,10 @@ var option_suites_1 = {
                                 "option_default_Some",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: 2,
-                                            _1: Js_option.getWithDefault(3, 2)
-                                          };
+                                      TAG: "Eq",
+                                      _0: 2,
+                                      _1: Js_option.getWithDefault(3, 2)
+                                    };
                                   })
                               ],
                               tl: {
@@ -197,10 +197,10 @@ var option_suites_1 = {
                                   "option_default_None",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: 3,
-                                              _1: Js_option.getWithDefault(3, undefined)
-                                            };
+                                        TAG: "Eq",
+                                        _0: 3,
+                                        _1: Js_option.getWithDefault(3, undefined)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -208,12 +208,12 @@ var option_suites_1 = {
                                     "option_filter_Pass",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Js_option.isSomeValue(simpleEq, 2, Js_option.filter((function (a) {
-                                                            return a % 2 === 0;
-                                                          }), 2))
-                                              };
+                                          TAG: "Eq",
+                                          _0: true,
+                                          _1: Js_option.isSomeValue(simpleEq, 2, Js_option.filter((function (a) {
+                                                      return a % 2 === 0;
+                                                    }), 2))
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -221,12 +221,12 @@ var option_suites_1 = {
                                       "option_filter_Reject",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: undefined,
-                                                  _1: Js_option.filter((function (a) {
-                                                          return a % 3 === 0;
-                                                        }), 2)
-                                                };
+                                            TAG: "Eq",
+                                            _0: undefined,
+                                            _1: Js_option.filter((function (a) {
+                                                    return a % 3 === 0;
+                                                  }), 2)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -234,12 +234,12 @@ var option_suites_1 = {
                                         "option_filter_None",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: undefined,
-                                                    _1: Js_option.filter((function (a) {
-                                                            return a % 3 === 0;
-                                                          }), undefined)
-                                                  };
+                                              TAG: "Eq",
+                                              _0: undefined,
+                                              _1: Js_option.filter((function (a) {
+                                                      return a % 3 === 0;
+                                                    }), undefined)
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -247,10 +247,10 @@ var option_suites_1 = {
                                           "option_firstSome_First",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: true,
-                                                      _1: Js_option.isSomeValue(simpleEq, 3, Js_option.firstSome(3, 2))
-                                                    };
+                                                TAG: "Eq",
+                                                _0: true,
+                                                _1: Js_option.isSomeValue(simpleEq, 3, Js_option.firstSome(3, 2))
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -258,10 +258,10 @@ var option_suites_1 = {
                                             "option_firstSome_First",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: true,
-                                                        _1: Js_option.isSomeValue(simpleEq, 2, Js_option.firstSome(undefined, 2))
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: true,
+                                                  _1: Js_option.isSomeValue(simpleEq, 2, Js_option.firstSome(undefined, 2))
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -269,10 +269,10 @@ var option_suites_1 = {
                                               "option_firstSome_None",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: undefined,
-                                                          _1: Js_option.firstSome(undefined, undefined)
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: undefined,
+                                                    _1: Js_option.firstSome(undefined, undefined)
+                                                  };
                                                 })
                                             ],
                                             tl: /* [] */0
diff --git a/jscomp/test/js_re_test.js b/jscomp/test/js_re_test.js
index 95ee7ad060c..31ab40bc55b 100644
--- a/jscomp/test/js_re_test.js
+++ b/jscomp/test/js_re_test.js
@@ -12,23 +12,23 @@ var suites_0 = [
       var result = re.exec("3-");
       if (result === null) {
         return {
-                TAG: "Fail",
-                _0: undefined
-              };
+          TAG: "Fail",
+          _0: undefined
+        };
       }
       var defined = Caml_array.get(result, 1);
       var $$undefined = Caml_array.get(result, 2);
       return {
-              TAG: "Eq",
-              _0: [
-                "3",
-                null
-              ],
-              _1: [
-                defined,
-                $$undefined
-              ]
-            };
+        TAG: "Eq",
+        _0: [
+          "3",
+          null
+        ],
+        _1: [
+          defined,
+          $$undefined
+        ]
+      };
     })
 ];
 
@@ -44,10 +44,10 @@ var suites_1 = {
           
         };
         return {
-                TAG: "Eq",
-                _0: contentOf("div", "<div>Hi</div>"),
-                _1: "Hi"
-              };
+          TAG: "Eq",
+          _0: contentOf("div", "<div>Hi</div>"),
+          _1: "Hi"
+        };
       })
   ],
   tl: {
@@ -57,15 +57,15 @@ var suites_1 = {
           var res = /[^.]+/.exec("http://xxx.domain.com");
           if (res !== null) {
             return {
-                    TAG: "Eq",
-                    _0: "http://xxx",
-                    _1: Caml_array.get(res, 0)
-                  };
+              TAG: "Eq",
+              _0: "http://xxx",
+              _1: Caml_array.get(res, 0)
+            };
           } else {
             return {
-                    TAG: "FailWith",
-                    _0: "regex should match"
-                  };
+              TAG: "FailWith",
+              _0: "regex should match"
+            };
           }
         })
     ],
@@ -76,14 +76,14 @@ var suites_1 = {
             var match = /https:\/\/(.*)/.exec("http://xxx.domain.com");
             if (match !== null) {
               return {
-                      TAG: "FailWith",
-                      _0: "regex should not match"
-                    };
+                TAG: "FailWith",
+                _0: "regex should not match"
+              };
             } else {
               return {
-                      TAG: "Ok",
-                      _0: true
-                    };
+                TAG: "Ok",
+                _0: true
+              };
             }
           })
       ],
@@ -93,10 +93,10 @@ var suites_1 = {
           (function (param) {
               var res = new RegExp("foo").test("#foo#");
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: res
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: res
+              };
             })
         ],
         tl: {
@@ -105,10 +105,10 @@ var suites_1 = {
             (function (param) {
                 var res = new RegExp("foo", "g");
                 return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: res.global
-                      };
+                  TAG: "Eq",
+                  _0: true,
+                  _1: res.global
+                };
               })
           ],
           tl: {
@@ -118,15 +118,15 @@ var suites_1 = {
                   var res = new RegExp("zbar").exec("foobarbazbar");
                   if (res !== null) {
                     return {
-                            TAG: "Eq",
-                            _0: 8,
-                            _1: res.index
-                          };
+                      TAG: "Eq",
+                      _0: 8,
+                      _1: res.index
+                    };
                   } else {
                     return {
-                            TAG: "Fail",
-                            _0: undefined
-                          };
+                      TAG: "Fail",
+                      _0: undefined
+                    };
                   }
                 })
             ],
@@ -138,15 +138,15 @@ var suites_1 = {
                     var res = /foo/g.exec(input);
                     if (res !== null) {
                       return {
-                              TAG: "Eq",
-                              _0: input,
-                              _1: res.input
-                            };
+                        TAG: "Eq",
+                        _0: input,
+                        _1: res.input
+                      };
                     } else {
                       return {
-                              TAG: "Fail",
-                              _0: undefined
-                            };
+                        TAG: "Fail",
+                        _0: undefined
+                      };
                     }
                   })
               ],
@@ -155,10 +155,10 @@ var suites_1 = {
                   "t_flags",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: "gi",
-                              _1: /./ig.flags
-                            };
+                        TAG: "Eq",
+                        _0: "gi",
+                        _1: /./ig.flags
+                      };
                     })
                 ],
                 tl: {
@@ -166,10 +166,10 @@ var suites_1 = {
                     "t_global",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: /./ig.global
-                              };
+                          TAG: "Eq",
+                          _0: true,
+                          _1: /./ig.global
+                        };
                       })
                   ],
                   tl: {
@@ -177,10 +177,10 @@ var suites_1 = {
                       "t_ignoreCase",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: /./ig.ignoreCase
-                                };
+                            TAG: "Eq",
+                            _0: true,
+                            _1: /./ig.ignoreCase
+                          };
                         })
                     ],
                     tl: {
@@ -190,10 +190,10 @@ var suites_1 = {
                             var re = /na/g;
                             re.exec("banana");
                             return {
-                                    TAG: "Eq",
-                                    _0: 4,
-                                    _1: re.lastIndex
-                                  };
+                              TAG: "Eq",
+                              _0: 4,
+                              _1: re.lastIndex
+                            };
                           })
                       ],
                       tl: {
@@ -205,16 +205,16 @@ var suites_1 = {
                               re.lastIndex = 42;
                               var after = re.lastIndex;
                               return {
-                                      TAG: "Eq",
-                                      _0: [
-                                        0,
-                                        42
-                                      ],
-                                      _1: [
-                                        before,
-                                        after
-                                      ]
-                                    };
+                                TAG: "Eq",
+                                _0: [
+                                  0,
+                                  42
+                                ],
+                                _1: [
+                                  before,
+                                  after
+                                ]
+                              };
                             })
                         ],
                         tl: {
@@ -222,10 +222,10 @@ var suites_1 = {
                             "t_multiline",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: /./ig.multiline
-                                      };
+                                  TAG: "Eq",
+                                  _0: false,
+                                  _1: /./ig.multiline
+                                };
                               })
                           ],
                           tl: {
@@ -233,10 +233,10 @@ var suites_1 = {
                               "t_source",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: "f.+o",
-                                          _1: /f.+o/ig.source
-                                        };
+                                    TAG: "Eq",
+                                    _0: "f.+o",
+                                    _1: /f.+o/ig.source
+                                  };
                                 })
                             ],
                             tl: {
@@ -244,10 +244,10 @@ var suites_1 = {
                                 "t_sticky",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: /./yg.sticky
-                                          };
+                                      TAG: "Eq",
+                                      _0: true,
+                                      _1: /./yg.sticky
+                                    };
                                   })
                               ],
                               tl: {
@@ -255,10 +255,10 @@ var suites_1 = {
                                   "t_unicode",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: /./yg.unicode
-                                            };
+                                        TAG: "Eq",
+                                        _0: false,
+                                        _1: /./yg.unicode
+                                      };
                                     })
                                 ],
                                 tl: /* [] */0
diff --git a/jscomp/test/js_string_test.js b/jscomp/test/js_string_test.js
index fd1d58dd42e..06be750d7dc 100644
--- a/jscomp/test/js_string_test.js
+++ b/jscomp/test/js_string_test.js
@@ -9,10 +9,10 @@ var suites_0 = [
   "make",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: "null",
-              _1: String(null).concat("")
-            };
+        TAG: "Eq",
+        _0: "null",
+        _1: String(null).concat("")
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ var suites_1 = {
     "fromCharCode",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: "a",
-                _1: String.fromCharCode(97)
-              };
+          TAG: "Eq",
+          _0: "a",
+          _1: String.fromCharCode(97)
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ var suites_1 = {
       "fromCharCodeMany",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: "az",
-                  _1: String.fromCharCode(97, 122)
-                };
+            TAG: "Eq",
+            _0: "az",
+            _1: String.fromCharCode(97, 122)
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ var suites_1 = {
         "fromCodePoint",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: "a",
-                    _1: String.fromCodePoint(97)
-                  };
+              TAG: "Eq",
+              _0: "a",
+              _1: String.fromCodePoint(97)
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
           "fromCodePointMany",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: "az",
-                      _1: String.fromCodePoint(97, 122)
-                    };
+                TAG: "Eq",
+                _0: "az",
+                _1: String.fromCodePoint(97, 122)
+              };
             })
         ],
         tl: {
@@ -65,10 +65,10 @@ var suites_1 = {
             "length",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 3,
-                        _1: "foo".length
-                      };
+                  TAG: "Eq",
+                  _0: 3,
+                  _1: "foo".length
+                };
               })
           ],
           tl: {
@@ -76,10 +76,10 @@ var suites_1 = {
               "get",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: "a",
-                          _1: "foobar"[4]
-                        };
+                    TAG: "Eq",
+                    _0: "a",
+                    _1: "foobar"[4]
+                  };
                 })
             ],
             tl: {
@@ -87,10 +87,10 @@ var suites_1 = {
                 "charAt",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: "a",
-                            _1: "foobar".charAt(4)
-                          };
+                      TAG: "Eq",
+                      _0: "a",
+                      _1: "foobar".charAt(4)
+                    };
                   })
               ],
               tl: {
@@ -98,10 +98,10 @@ var suites_1 = {
                   "charCodeAt",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: 97,
-                              _1: "foobar".charCodeAt(4)
-                            };
+                        TAG: "Eq",
+                        _0: 97,
+                        _1: "foobar".charCodeAt(4)
+                      };
                     })
                 ],
                 tl: {
@@ -109,10 +109,10 @@ var suites_1 = {
                     "codePointAt",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: 97,
-                                _1: "foobar".codePointAt(4)
-                              };
+                          TAG: "Eq",
+                          _0: 97,
+                          _1: "foobar".codePointAt(4)
+                        };
                       })
                   ],
                   tl: {
@@ -120,10 +120,10 @@ var suites_1 = {
                       "codePointAt - out of bounds",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: undefined,
-                                  _1: "foobar".codePointAt(98)
-                                };
+                            TAG: "Eq",
+                            _0: undefined,
+                            _1: "foobar".codePointAt(98)
+                          };
                         })
                     ],
                     tl: {
@@ -131,10 +131,10 @@ var suites_1 = {
                         "concat",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: "foobar",
-                                    _1: "foo".concat("bar")
-                                  };
+                              TAG: "Eq",
+                              _0: "foobar",
+                              _1: "foo".concat("bar")
+                            };
                           })
                       ],
                       tl: {
@@ -142,10 +142,10 @@ var suites_1 = {
                           "concatMany",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: "foobarbaz",
-                                      _1: "foo".concat("bar", "baz")
-                                    };
+                                TAG: "Eq",
+                                _0: "foobarbaz",
+                                _1: "foo".concat("bar", "baz")
+                              };
                             })
                         ],
                         tl: {
@@ -153,10 +153,10 @@ var suites_1 = {
                             "endsWith",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: "foobar".endsWith("bar")
-                                      };
+                                  TAG: "Eq",
+                                  _0: true,
+                                  _1: "foobar".endsWith("bar")
+                                };
                               })
                           ],
                           tl: {
@@ -164,10 +164,10 @@ var suites_1 = {
                               "endsWithFrom",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: "foobar".endsWith("bar", 1)
-                                        };
+                                    TAG: "Eq",
+                                    _0: false,
+                                    _1: "foobar".endsWith("bar", 1)
+                                  };
                                 })
                             ],
                             tl: {
@@ -175,10 +175,10 @@ var suites_1 = {
                                 "includes",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: "foobarbaz".includes("bar")
-                                          };
+                                      TAG: "Eq",
+                                      _0: true,
+                                      _1: "foobarbaz".includes("bar")
+                                    };
                                   })
                               ],
                               tl: {
@@ -186,10 +186,10 @@ var suites_1 = {
                                   "includesFrom",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: "foobarbaz".includes("bar", 4)
-                                            };
+                                        TAG: "Eq",
+                                        _0: false,
+                                        _1: "foobarbaz".includes("bar", 4)
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -197,10 +197,10 @@ var suites_1 = {
                                     "indexOf",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: 3,
-                                                _1: "foobarbaz".indexOf("bar")
-                                              };
+                                          TAG: "Eq",
+                                          _0: 3,
+                                          _1: "foobarbaz".indexOf("bar")
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -208,10 +208,10 @@ var suites_1 = {
                                       "indexOfFrom",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: -1,
-                                                  _1: "foobarbaz".indexOf("bar", 4)
-                                                };
+                                            TAG: "Eq",
+                                            _0: -1,
+                                            _1: "foobarbaz".indexOf("bar", 4)
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -219,10 +219,10 @@ var suites_1 = {
                                         "lastIndexOf",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: 3,
-                                                    _1: "foobarbaz".lastIndexOf("bar")
-                                                  };
+                                              TAG: "Eq",
+                                              _0: 3,
+                                              _1: "foobarbaz".lastIndexOf("bar")
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -230,10 +230,10 @@ var suites_1 = {
                                           "lastIndexOfFrom",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: 3,
-                                                      _1: "foobarbaz".lastIndexOf("bar", 4)
-                                                    };
+                                                TAG: "Eq",
+                                                _0: 3,
+                                                _1: "foobarbaz".lastIndexOf("bar", 4)
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -241,10 +241,10 @@ var suites_1 = {
                                             "localeCompare",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: 0,
-                                                        _1: "foo".localeCompare("foo")
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: 0,
+                                                  _1: "foo".localeCompare("foo")
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -252,13 +252,13 @@ var suites_1 = {
                                               "match",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            "na",
-                                                            "na"
-                                                          ],
-                                                          _1: Caml_option.null_to_opt("banana".match(/na+/g))
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: [
+                                                      "na",
+                                                      "na"
+                                                    ],
+                                                    _1: Caml_option.null_to_opt("banana".match(/na+/g))
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -266,10 +266,10 @@ var suites_1 = {
                                                 "match - no match",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: undefined,
-                                                            _1: Caml_option.null_to_opt("banana".match(/nanana+/g))
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: undefined,
+                                                      _1: Caml_option.null_to_opt("banana".match(/nanana+/g))
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -277,15 +277,15 @@ var suites_1 = {
                                                   "match - not found capture groups",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: [
-                                                                "hello ",
-                                                                undefined
-                                                              ],
-                                                              _1: Belt_Option.map(Caml_option.null_to_opt("hello word".match(/hello (world)?/)), (function (prim) {
-                                                                      return prim.slice();
-                                                                    }))
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: [
+                                                          "hello ",
+                                                          undefined
+                                                        ],
+                                                        _1: Belt_Option.map(Caml_option.null_to_opt("hello word".match(/hello (world)?/)), (function (prim) {
+                                                                return prim.slice();
+                                                              }))
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -293,10 +293,10 @@ var suites_1 = {
                                                     "normalize",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: "foo",
-                                                                _1: "foo".normalize()
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: "foo",
+                                                          _1: "foo".normalize()
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -304,10 +304,10 @@ var suites_1 = {
                                                       "normalizeByForm",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: "foo",
-                                                                  _1: "foo".normalize("NFKD")
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: "foo",
+                                                            _1: "foo".normalize("NFKD")
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -315,10 +315,10 @@ var suites_1 = {
                                                         "repeat",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: "foofoofoo",
-                                                                    _1: "foo".repeat(3)
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: "foofoofoo",
+                                                              _1: "foo".repeat(3)
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -326,10 +326,10 @@ var suites_1 = {
                                                           "replace",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: "fooBORKbaz",
-                                                                      _1: "foobarbaz".replace("bar", "BORK")
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: "fooBORKbaz",
+                                                                _1: "foobarbaz".replace("bar", "BORK")
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -337,10 +337,10 @@ var suites_1 = {
                                                             "replaceByRe",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: "fooBORKBORK",
-                                                                        _1: "foobarbaz".replace(/ba./g, "BORK")
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: "fooBORKBORK",
+                                                                  _1: "foobarbaz".replace(/ba./g, "BORK")
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -355,10 +355,10 @@ var suites_1 = {
                                                                     }
                                                                   };
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: "fooBORKDORK",
-                                                                          _1: "foobarbaz".replace(/ba./g, replace)
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: "fooBORKDORK",
+                                                                    _1: "foobarbaz".replace(/ba./g, replace)
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -373,10 +373,10 @@ var suites_1 = {
                                                                       }
                                                                     };
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: "fooBORKDORK",
-                                                                            _1: "foobarbaz".replace(/ba./g, replace)
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: "fooBORKDORK",
+                                                                      _1: "foobarbaz".replace(/ba./g, replace)
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -391,10 +391,10 @@ var suites_1 = {
                                                                         }
                                                                       };
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: "fooBORKDORK",
-                                                                              _1: "foobarbaz".replace(/ba./g, replace)
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: "fooBORKDORK",
+                                                                        _1: "foobarbaz".replace(/ba./g, replace)
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -409,10 +409,10 @@ var suites_1 = {
                                                                           }
                                                                         };
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: "fooBORKDORK",
-                                                                                _1: "foobarbaz".replace(/ba./g, replace)
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: "fooBORKDORK",
+                                                                          _1: "foobarbaz".replace(/ba./g, replace)
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -420,10 +420,10 @@ var suites_1 = {
                                                                       "search",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 3,
-                                                                                  _1: "foobarbaz".search(/ba./g)
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: 3,
+                                                                            _1: "foobarbaz".search(/ba./g)
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -431,10 +431,10 @@ var suites_1 = {
                                                                         "slice",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: "bar",
-                                                                                    _1: "foobarbaz".slice(3, 6)
-                                                                                  };
+                                                                              TAG: "Eq",
+                                                                              _0: "bar",
+                                                                              _1: "foobarbaz".slice(3, 6)
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -442,10 +442,10 @@ var suites_1 = {
                                                                           "sliceToEnd",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: "barbaz",
-                                                                                      _1: "foobarbaz".slice(3)
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: "barbaz",
+                                                                                _1: "foobarbaz".slice(3)
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -453,14 +453,14 @@ var suites_1 = {
                                                                             "split",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          "foo",
-                                                                                          "bar",
-                                                                                          "baz"
-                                                                                        ],
-                                                                                        _1: "foo bar baz".split(" ")
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: [
+                                                                                    "foo",
+                                                                                    "bar",
+                                                                                    "baz"
+                                                                                  ],
+                                                                                  _1: "foo bar baz".split(" ")
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -468,13 +468,13 @@ var suites_1 = {
                                                                               "splitAtMost",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: [
-                                                                                            "foo",
-                                                                                            "bar"
-                                                                                          ],
-                                                                                          _1: "foo bar baz".split(" ", 2)
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: [
+                                                                                      "foo",
+                                                                                      "bar"
+                                                                                    ],
+                                                                                    _1: "foo bar baz".split(" ", 2)
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -482,18 +482,18 @@ var suites_1 = {
                                                                                 "splitByRe",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              "a",
-                                                                                              "#",
-                                                                                              undefined,
-                                                                                              "b",
-                                                                                              "#",
-                                                                                              ":",
-                                                                                              "c"
-                                                                                            ],
-                                                                                            _1: "a#b#:c".split(/(#)(:)?/)
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: [
+                                                                                        "a",
+                                                                                        "#",
+                                                                                        undefined,
+                                                                                        "b",
+                                                                                        "#",
+                                                                                        ":",
+                                                                                        "c"
+                                                                                      ],
+                                                                                      _1: "a#b#:c".split(/(#)(:)?/)
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -501,14 +501,14 @@ var suites_1 = {
                                                                                   "splitByReAtMost",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: [
-                                                                                                "a",
-                                                                                                "#",
-                                                                                                undefined
-                                                                                              ],
-                                                                                              _1: "a#b#:c".split(/(#)(:)?/, 3)
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: [
+                                                                                          "a",
+                                                                                          "#",
+                                                                                          undefined
+                                                                                        ],
+                                                                                        _1: "a#b#:c".split(/(#)(:)?/, 3)
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -516,10 +516,10 @@ var suites_1 = {
                                                                                     "startsWith",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: true,
-                                                                                                _1: "foobarbaz".startsWith("foo")
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: true,
+                                                                                          _1: "foobarbaz".startsWith("foo")
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -527,10 +527,10 @@ var suites_1 = {
                                                                                       "startsWithFrom",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: false,
-                                                                                                  _1: "foobarbaz".startsWith("foo", 1)
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: false,
+                                                                                            _1: "foobarbaz".startsWith("foo", 1)
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -538,10 +538,10 @@ var suites_1 = {
                                                                                         "substr",
                                                                                         (function (param) {
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: "barbaz",
-                                                                                                    _1: "foobarbaz".substr(3)
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: "barbaz",
+                                                                                              _1: "foobarbaz".substr(3)
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -549,10 +549,10 @@ var suites_1 = {
                                                                                           "substrAtMost",
                                                                                           (function (param) {
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: "bar",
-                                                                                                      _1: "foobarbaz".substr(3, 3)
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: "bar",
+                                                                                                _1: "foobarbaz".substr(3, 3)
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -560,10 +560,10 @@ var suites_1 = {
                                                                                             "substring",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: "bar",
-                                                                                                        _1: "foobarbaz".substring(3, 6)
-                                                                                                      };
+                                                                                                  TAG: "Eq",
+                                                                                                  _0: "bar",
+                                                                                                  _1: "foobarbaz".substring(3, 6)
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -571,10 +571,10 @@ var suites_1 = {
                                                                                               "substringToEnd",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: "barbaz",
-                                                                                                          _1: "foobarbaz".substring(3)
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: "barbaz",
+                                                                                                    _1: "foobarbaz".substring(3)
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -582,10 +582,10 @@ var suites_1 = {
                                                                                                 "toLowerCase",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: "bork",
-                                                                                                            _1: "BORK".toLowerCase()
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: "bork",
+                                                                                                      _1: "BORK".toLowerCase()
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -593,10 +593,10 @@ var suites_1 = {
                                                                                                   "toLocaleLowerCase",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: "bork",
-                                                                                                              _1: "BORK".toLocaleLowerCase()
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: "bork",
+                                                                                                        _1: "BORK".toLocaleLowerCase()
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -604,10 +604,10 @@ var suites_1 = {
                                                                                                     "toUpperCase",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: "FUBAR",
-                                                                                                                _1: "fubar".toUpperCase()
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: "FUBAR",
+                                                                                                          _1: "fubar".toUpperCase()
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -615,10 +615,10 @@ var suites_1 = {
                                                                                                       "toLocaleUpperCase",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: "FUBAR",
-                                                                                                                  _1: "fubar".toLocaleUpperCase()
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: "FUBAR",
+                                                                                                            _1: "fubar".toLocaleUpperCase()
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -626,10 +626,10 @@ var suites_1 = {
                                                                                                         "trim",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: "foo",
-                                                                                                                    _1: "  foo  ".trim()
-                                                                                                                  };
+                                                                                                              TAG: "Eq",
+                                                                                                              _0: "foo",
+                                                                                                              _1: "  foo  ".trim()
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -637,10 +637,10 @@ var suites_1 = {
                                                                                                           "anchor",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: "<a name=\"bar\">foo</a>",
-                                                                                                                      _1: "foo".anchor("bar")
-                                                                                                                    };
+                                                                                                                TAG: "Eq",
+                                                                                                                _0: "<a name=\"bar\">foo</a>",
+                                                                                                                _1: "foo".anchor("bar")
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -648,10 +648,10 @@ var suites_1 = {
                                                                                                             "link",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: "<a href=\"https://reason.ml\">foo</a>",
-                                                                                                                        _1: "foo".link("https://reason.ml")
-                                                                                                                      };
+                                                                                                                  TAG: "Eq",
+                                                                                                                  _0: "<a href=\"https://reason.ml\">foo</a>",
+                                                                                                                  _1: "foo".link("https://reason.ml")
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -659,9 +659,9 @@ var suites_1 = {
                                                                                                               "File \"js_string_test.res\", line 138, characters 5-12",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: "Ok",
-                                                                                                                          _0: "ab".includes("a")
-                                                                                                                        };
+                                                                                                                    TAG: "Ok",
+                                                                                                                    _0: "ab".includes("a")
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: /* [] */0
diff --git a/jscomp/test/js_typed_array_test.js b/jscomp/test/js_typed_array_test.js
index 43e6c36184d..3cf244c886d 100644
--- a/jscomp/test/js_typed_array_test.js
+++ b/jscomp/test/js_typed_array_test.js
@@ -30,10 +30,10 @@ var suites_0 = [
   "array_buffer - make",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 5,
-              _1: new ArrayBuffer(5).byteLength
-            };
+        TAG: "Eq",
+        _0: 5,
+        _1: new ArrayBuffer(5).byteLength
+      };
     })
 ];
 
@@ -42,10 +42,10 @@ var suites_1 = {
     "array_buffer - byteLength",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 5,
-                _1: new ArrayBuffer(5).byteLength
-              };
+          TAG: "Eq",
+          _0: 5,
+          _1: new ArrayBuffer(5).byteLength
+        };
       })
   ],
   tl: {
@@ -53,10 +53,10 @@ var suites_1 = {
       "array_buffer - slice",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: 2,
-                  _1: Js_typed_array.$$ArrayBuffer.slice(2, 4, new ArrayBuffer(5)).byteLength
-                };
+            TAG: "Eq",
+            _0: 2,
+            _1: Js_typed_array.$$ArrayBuffer.slice(2, 4, new ArrayBuffer(5)).byteLength
+          };
         })
     ],
     tl: {
@@ -64,10 +64,10 @@ var suites_1 = {
         "array_buffer - sliceFrom",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: 3,
-                    _1: Js_typed_array.$$ArrayBuffer.sliceFrom(2, new ArrayBuffer(5)).byteLength
-                  };
+              TAG: "Eq",
+              _0: 3,
+              _1: Js_typed_array.$$ArrayBuffer.sliceFrom(2, new ArrayBuffer(5)).byteLength
+            };
           })
       ],
       tl: {
@@ -75,16 +75,16 @@ var suites_1 = {
           "typed_array - unsafe_get",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 4,
-                      _1: new Int8Array([
-                              1,
-                              2,
-                              3,
-                              4,
-                              5
-                            ])[3]
-                    };
+                TAG: "Eq",
+                _0: 4,
+                _1: new Int8Array([
+                        1,
+                        2,
+                        3,
+                        4,
+                        5
+                      ])[3]
+              };
             })
         ],
         tl: {
@@ -100,10 +100,10 @@ var suites_1 = {
                     ]);
                 a[3] = 14;
                 return {
-                        TAG: "Eq",
-                        _0: 14,
-                        _1: a[3]
-                      };
+                  TAG: "Eq",
+                  _0: 14,
+                  _1: a[3]
+                };
               })
           ],
           tl: {
@@ -111,20 +111,20 @@ var suites_1 = {
               "typed_array - buffer",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: new Int8Array([
-                                3,
-                                4,
-                                5
-                              ]),
-                          _1: new Int8Array(new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).buffer, 2)
-                        };
+                    TAG: "Eq",
+                    _0: new Int8Array([
+                          3,
+                          4,
+                          5
+                        ]),
+                    _1: new Int8Array(new Int8Array([
+                              1,
+                              2,
+                              3,
+                              4,
+                              5
+                            ]).buffer, 2)
+                  };
                 })
             ],
             tl: {
@@ -132,16 +132,16 @@ var suites_1 = {
                 "typed_array - byteLength",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: 10,
-                            _1: new Int16Array([
-                                  1,
-                                  2,
-                                  3,
-                                  4,
-                                  5
-                                ]).byteLength
-                          };
+                      TAG: "Eq",
+                      _0: 10,
+                      _1: new Int16Array([
+                            1,
+                            2,
+                            3,
+                            4,
+                            5
+                          ]).byteLength
+                    };
                   })
               ],
               tl: {
@@ -149,16 +149,16 @@ var suites_1 = {
                   "typed_array - byteOffset",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: 0,
-                              _1: new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).byteOffset
-                            };
+                        TAG: "Eq",
+                        _0: 0,
+                        _1: new Int8Array([
+                              1,
+                              2,
+                              3,
+                              4,
+                              5
+                            ]).byteOffset
+                      };
                     })
                 ],
                 tl: {
@@ -174,22 +174,22 @@ var suites_1 = {
                           return a;
                         };
                         return {
-                                TAG: "Eq",
-                                _0: new Int8Array([
-                                      9,
-                                      8,
-                                      7,
-                                      4,
-                                      5
-                                    ]),
-                                _1: f(new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]))
-                              };
+                          TAG: "Eq",
+                          _0: new Int8Array([
+                                9,
+                                8,
+                                7,
+                                4,
+                                5
+                              ]),
+                          _1: f(new Int8Array([
+                                    1,
+                                    2,
+                                    3,
+                                    4,
+                                    5
+                                  ]))
+                        };
                       })
                   ],
                   tl: {
@@ -205,22 +205,22 @@ var suites_1 = {
                             return a;
                           };
                           return {
-                                  TAG: "Eq",
-                                  _0: new Int8Array([
-                                        1,
-                                        2,
-                                        9,
-                                        8,
-                                        7
-                                      ]),
-                                  _1: f(new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            4,
-                                            5
-                                          ]))
-                                };
+                            TAG: "Eq",
+                            _0: new Int8Array([
+                                  1,
+                                  2,
+                                  9,
+                                  8,
+                                  7
+                                ]),
+                            _1: f(new Int8Array([
+                                      1,
+                                      2,
+                                      3,
+                                      4,
+                                      5
+                                    ]))
+                          };
                         })
                     ],
                     tl: {
@@ -228,16 +228,16 @@ var suites_1 = {
                         "typed_array - length",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: 5,
-                                    _1: new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]).length
-                                  };
+                              TAG: "Eq",
+                              _0: 5,
+                              _1: new Int8Array([
+                                    1,
+                                    2,
+                                    3,
+                                    4,
+                                    5
+                                  ]).length
+                            };
                           })
                       ],
                       tl: {
@@ -245,22 +245,22 @@ var suites_1 = {
                           "typed_array - copyWithin",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            1,
-                                            2
-                                          ]),
-                                      _1: Js_typed_array.$$Int8Array.copyWithin(-2, new Int8Array([
-                                                1,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]))
-                                    };
+                                TAG: "Eq",
+                                _0: new Int8Array([
+                                      1,
+                                      2,
+                                      3,
+                                      1,
+                                      2
+                                    ]),
+                                _1: Js_typed_array.$$Int8Array.copyWithin(-2, new Int8Array([
+                                          1,
+                                          2,
+                                          3,
+                                          4,
+                                          5
+                                        ]))
+                              };
                             })
                         ],
                         tl: {
@@ -268,22 +268,22 @@ var suites_1 = {
                             "typed_array - copyWithinFrom",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: new Int8Array([
-                                              4,
-                                              5,
-                                              3,
-                                              4,
-                                              5
-                                            ]),
-                                        _1: Js_typed_array.$$Int8Array.copyWithinFrom(0, 3, new Int8Array([
-                                                  1,
-                                                  2,
-                                                  3,
-                                                  4,
-                                                  5
-                                                ]))
-                                      };
+                                  TAG: "Eq",
+                                  _0: new Int8Array([
+                                        4,
+                                        5,
+                                        3,
+                                        4,
+                                        5
+                                      ]),
+                                  _1: Js_typed_array.$$Int8Array.copyWithinFrom(0, 3, new Int8Array([
+                                            1,
+                                            2,
+                                            3,
+                                            4,
+                                            5
+                                          ]))
+                                };
                               })
                           ],
                           tl: {
@@ -291,22 +291,22 @@ var suites_1 = {
                               "typed_array - copyWithinFromRange",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: new Int8Array([
-                                                4,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]),
-                                          _1: Js_typed_array.$$Int8Array.copyWithinFromRange(0, 3, 4, new Int8Array([
-                                                    1,
-                                                    2,
-                                                    3,
-                                                    4,
-                                                    5
-                                                  ]))
-                                        };
+                                    TAG: "Eq",
+                                    _0: new Int8Array([
+                                          4,
+                                          2,
+                                          3,
+                                          4,
+                                          5
+                                        ]),
+                                    _1: Js_typed_array.$$Int8Array.copyWithinFromRange(0, 3, 4, new Int8Array([
+                                              1,
+                                              2,
+                                              3,
+                                              4,
+                                              5
+                                            ]))
+                                  };
                                 })
                             ],
                             tl: {
@@ -314,18 +314,18 @@ var suites_1 = {
                                 "typed_array - fillInPlace",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: new Int8Array([
-                                                  4,
-                                                  4,
-                                                  4
-                                                ]),
-                                            _1: Js_typed_array.$$Int8Array.fillInPlace(4, new Int8Array([
-                                                      1,
-                                                      2,
-                                                      3
-                                                    ]))
-                                          };
+                                      TAG: "Eq",
+                                      _0: new Int8Array([
+                                            4,
+                                            4,
+                                            4
+                                          ]),
+                                      _1: Js_typed_array.$$Int8Array.fillInPlace(4, new Int8Array([
+                                                1,
+                                                2,
+                                                3
+                                              ]))
+                                    };
                                   })
                               ],
                               tl: {
@@ -333,18 +333,18 @@ var suites_1 = {
                                   "typed_array - fillFromInPlace",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: new Int8Array([
-                                                    1,
-                                                    4,
-                                                    4
-                                                  ]),
-                                              _1: Js_typed_array.$$Int8Array.fillFromInPlace(4, 1, new Int8Array([
-                                                        1,
-                                                        2,
-                                                        3
-                                                      ]))
-                                            };
+                                        TAG: "Eq",
+                                        _0: new Int8Array([
+                                              1,
+                                              4,
+                                              4
+                                            ]),
+                                        _1: Js_typed_array.$$Int8Array.fillFromInPlace(4, 1, new Int8Array([
+                                                  1,
+                                                  2,
+                                                  3
+                                                ]))
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -352,18 +352,18 @@ var suites_1 = {
                                     "typed_array - fillRangeInPlace",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: new Int8Array([
-                                                      1,
-                                                      4,
-                                                      3
-                                                    ]),
-                                                _1: Js_typed_array.$$Int8Array.fillRangeInPlace(4, 1, 2, new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]))
-                                              };
+                                          TAG: "Eq",
+                                          _0: new Int8Array([
+                                                1,
+                                                4,
+                                                3
+                                              ]),
+                                          _1: Js_typed_array.$$Int8Array.fillRangeInPlace(4, 1, 2, new Int8Array([
+                                                    1,
+                                                    2,
+                                                    3
+                                                  ]))
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -371,18 +371,18 @@ var suites_1 = {
                                       "typed_array - reverseInPlace",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: new Int8Array([
-                                                        3,
-                                                        2,
-                                                        1
-                                                      ]),
-                                                  _1: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]).reverse()
-                                                };
+                                            TAG: "Eq",
+                                            _0: new Int8Array([
+                                                  3,
+                                                  2,
+                                                  1
+                                                ]),
+                                            _1: new Int8Array([
+                                                    1,
+                                                    2,
+                                                    3
+                                                  ]).reverse()
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -390,18 +390,18 @@ var suites_1 = {
                                         "typed_array - sortInPlace",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]),
-                                                    _1: new Int8Array([
-                                                            3,
-                                                            1,
-                                                            2
-                                                          ]).sort()
-                                                  };
+                                              TAG: "Eq",
+                                              _0: new Int8Array([
+                                                    1,
+                                                    2,
+                                                    3
+                                                  ]),
+                                              _1: new Int8Array([
+                                                      3,
+                                                      1,
+                                                      2
+                                                    ]).sort()
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -409,20 +409,20 @@ var suites_1 = {
                                           "typed_array - sortInPlaceWith",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: new Int8Array([
-                                                            3,
-                                                            2,
-                                                            1
-                                                          ]),
-                                                      _1: Js_typed_array.$$Int8Array.sortInPlaceWith((function (a, b) {
-                                                              return b - a | 0;
-                                                            }), new Int8Array([
-                                                                3,
-                                                                1,
-                                                                2
-                                                              ]))
-                                                    };
+                                                TAG: "Eq",
+                                                _0: new Int8Array([
+                                                      3,
+                                                      2,
+                                                      1
+                                                    ]),
+                                                _1: Js_typed_array.$$Int8Array.sortInPlaceWith((function (a, b) {
+                                                        return b - a | 0;
+                                                      }), new Int8Array([
+                                                          3,
+                                                          1,
+                                                          2
+                                                        ]))
+                                              };
                                             })
                                         ],
                                         tl: {
@@ -430,14 +430,14 @@ var suites_1 = {
                                             "typed_array - includes",
                                             (function (param) {
                                                 return {
-                                                        TAG: "Eq",
-                                                        _0: true,
-                                                        _1: Js_typed_array.$$Int8Array.includes(3, new Int8Array([
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ]))
-                                                      };
+                                                  TAG: "Eq",
+                                                  _0: true,
+                                                  _1: Js_typed_array.$$Int8Array.includes(3, new Int8Array([
+                                                            1,
+                                                            2,
+                                                            3
+                                                          ]))
+                                                };
                                               })
                                           ],
                                           tl: {
@@ -445,14 +445,14 @@ var suites_1 = {
                                               "typed_array - indexOf",
                                               (function (param) {
                                                   return {
-                                                          TAG: "Eq",
-                                                          _0: 1,
-                                                          _1: Js_typed_array.$$Int8Array.indexOf(2, new Int8Array([
-                                                                    1,
-                                                                    2,
-                                                                    3
-                                                                  ]))
-                                                        };
+                                                    TAG: "Eq",
+                                                    _0: 1,
+                                                    _1: Js_typed_array.$$Int8Array.indexOf(2, new Int8Array([
+                                                              1,
+                                                              2,
+                                                              3
+                                                            ]))
+                                                  };
                                                 })
                                             ],
                                             tl: {
@@ -460,15 +460,15 @@ var suites_1 = {
                                                 "typed_array - indexOfFrom",
                                                 (function (param) {
                                                     return {
-                                                            TAG: "Eq",
-                                                            _0: 3,
-                                                            _1: Js_typed_array.$$Int8Array.indexOfFrom(2, 2, new Int8Array([
-                                                                      1,
-                                                                      2,
-                                                                      3,
-                                                                      2
-                                                                    ]))
-                                                          };
+                                                      TAG: "Eq",
+                                                      _0: 3,
+                                                      _1: Js_typed_array.$$Int8Array.indexOfFrom(2, 2, new Int8Array([
+                                                                1,
+                                                                2,
+                                                                3,
+                                                                2
+                                                              ]))
+                                                    };
                                                   })
                                               ],
                                               tl: {
@@ -476,14 +476,14 @@ var suites_1 = {
                                                   "typed_array - join",
                                                   (function (param) {
                                                       return {
-                                                              TAG: "Eq",
-                                                              _0: "1,2,3",
-                                                              _1: new Int8Array([
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ]).join()
-                                                            };
+                                                        TAG: "Eq",
+                                                        _0: "1,2,3",
+                                                        _1: new Int8Array([
+                                                                1,
+                                                                2,
+                                                                3
+                                                              ]).join()
+                                                      };
                                                     })
                                                 ],
                                                 tl: {
@@ -491,14 +491,14 @@ var suites_1 = {
                                                     "typed_array - joinWith",
                                                     (function (param) {
                                                         return {
-                                                                TAG: "Eq",
-                                                                _0: "1;2;3",
-                                                                _1: Js_typed_array.$$Int8Array.joinWith(";", new Int8Array([
-                                                                          1,
-                                                                          2,
-                                                                          3
-                                                                        ]))
-                                                              };
+                                                          TAG: "Eq",
+                                                          _0: "1;2;3",
+                                                          _1: Js_typed_array.$$Int8Array.joinWith(";", new Int8Array([
+                                                                    1,
+                                                                    2,
+                                                                    3
+                                                                  ]))
+                                                        };
                                                       })
                                                   ],
                                                   tl: {
@@ -506,14 +506,14 @@ var suites_1 = {
                                                       "typed_array - lastIndexOf",
                                                       (function (param) {
                                                           return {
-                                                                  TAG: "Eq",
-                                                                  _0: 1,
-                                                                  _1: Js_typed_array.$$Int8Array.lastIndexOf(2, new Int8Array([
-                                                                            1,
-                                                                            2,
-                                                                            3
-                                                                          ]))
-                                                                };
+                                                            TAG: "Eq",
+                                                            _0: 1,
+                                                            _1: Js_typed_array.$$Int8Array.lastIndexOf(2, new Int8Array([
+                                                                      1,
+                                                                      2,
+                                                                      3
+                                                                    ]))
+                                                          };
                                                         })
                                                     ],
                                                     tl: {
@@ -521,15 +521,15 @@ var suites_1 = {
                                                         "typed_array - lastIndexOfFrom",
                                                         (function (param) {
                                                             return {
-                                                                    TAG: "Eq",
-                                                                    _0: 1,
-                                                                    _1: Js_typed_array.$$Int8Array.lastIndexOfFrom(2, 2, new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              2
-                                                                            ]))
-                                                                  };
+                                                              TAG: "Eq",
+                                                              _0: 1,
+                                                              _1: Js_typed_array.$$Int8Array.lastIndexOfFrom(2, 2, new Int8Array([
+                                                                        1,
+                                                                        2,
+                                                                        3,
+                                                                        2
+                                                                      ]))
+                                                            };
                                                           })
                                                       ],
                                                       tl: {
@@ -537,19 +537,19 @@ var suites_1 = {
                                                           "typed_array - slice",
                                                           (function (param) {
                                                               return {
-                                                                      TAG: "Eq",
-                                                                      _0: new Int8Array([
-                                                                            2,
-                                                                            3
-                                                                          ]),
-                                                                      _1: Js_typed_array.$$Int8Array.slice(1, 3, new Int8Array([
-                                                                                1,
-                                                                                2,
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]))
-                                                                    };
+                                                                TAG: "Eq",
+                                                                _0: new Int8Array([
+                                                                      2,
+                                                                      3
+                                                                    ]),
+                                                                _1: Js_typed_array.$$Int8Array.slice(1, 3, new Int8Array([
+                                                                          1,
+                                                                          2,
+                                                                          3,
+                                                                          4,
+                                                                          5
+                                                                        ]))
+                                                              };
                                                             })
                                                         ],
                                                         tl: {
@@ -557,22 +557,22 @@ var suites_1 = {
                                                             "typed_array - copy",
                                                             (function (param) {
                                                                 return {
-                                                                        TAG: "Eq",
-                                                                        _0: new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              4,
-                                                                              5
-                                                                            ]),
-                                                                        _1: new Int8Array([
-                                                                                1,
-                                                                                2,
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]).slice()
-                                                                      };
+                                                                  TAG: "Eq",
+                                                                  _0: new Int8Array([
+                                                                        1,
+                                                                        2,
+                                                                        3,
+                                                                        4,
+                                                                        5
+                                                                      ]),
+                                                                  _1: new Int8Array([
+                                                                          1,
+                                                                          2,
+                                                                          3,
+                                                                          4,
+                                                                          5
+                                                                        ]).slice()
+                                                                };
                                                               })
                                                           ],
                                                           tl: {
@@ -580,20 +580,20 @@ var suites_1 = {
                                                               "typed_array - sliceFrom",
                                                               (function (param) {
                                                                   return {
-                                                                          TAG: "Eq",
-                                                                          _0: new Int8Array([
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]),
-                                                                          _1: Js_typed_array.$$Int8Array.sliceFrom(2, new Int8Array([
-                                                                                    1,
-                                                                                    2,
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]))
-                                                                        };
+                                                                    TAG: "Eq",
+                                                                    _0: new Int8Array([
+                                                                          3,
+                                                                          4,
+                                                                          5
+                                                                        ]),
+                                                                    _1: Js_typed_array.$$Int8Array.sliceFrom(2, new Int8Array([
+                                                                              1,
+                                                                              2,
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ]))
+                                                                  };
                                                                 })
                                                             ],
                                                             tl: {
@@ -601,19 +601,19 @@ var suites_1 = {
                                                                 "typed_array - subarray",
                                                                 (function (param) {
                                                                     return {
-                                                                            TAG: "Eq",
-                                                                            _0: new Int8Array([
-                                                                                  2,
-                                                                                  3
-                                                                                ]),
-                                                                            _1: Js_typed_array.$$Int8Array.subarray(1, 3, new Int8Array([
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      4,
-                                                                                      5
-                                                                                    ]))
-                                                                          };
+                                                                      TAG: "Eq",
+                                                                      _0: new Int8Array([
+                                                                            2,
+                                                                            3
+                                                                          ]),
+                                                                      _1: Js_typed_array.$$Int8Array.subarray(1, 3, new Int8Array([
+                                                                                1,
+                                                                                2,
+                                                                                3,
+                                                                                4,
+                                                                                5
+                                                                              ]))
+                                                                    };
                                                                   })
                                                               ],
                                                               tl: {
@@ -621,20 +621,20 @@ var suites_1 = {
                                                                   "typed_array - subarrayFrom",
                                                                   (function (param) {
                                                                       return {
-                                                                              TAG: "Eq",
-                                                                              _0: new Int8Array([
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]),
-                                                                              _1: Js_typed_array.$$Int8Array.subarrayFrom(2, new Int8Array([
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ]))
-                                                                            };
+                                                                        TAG: "Eq",
+                                                                        _0: new Int8Array([
+                                                                              3,
+                                                                              4,
+                                                                              5
+                                                                            ]),
+                                                                        _1: Js_typed_array.$$Int8Array.subarrayFrom(2, new Int8Array([
+                                                                                  1,
+                                                                                  2,
+                                                                                  3,
+                                                                                  4,
+                                                                                  5
+                                                                                ]))
+                                                                      };
                                                                     })
                                                                 ],
                                                                 tl: {
@@ -642,14 +642,14 @@ var suites_1 = {
                                                                     "typed_array - toString",
                                                                     (function (param) {
                                                                         return {
-                                                                                TAG: "Eq",
-                                                                                _0: "1,2,3",
-                                                                                _1: new Int8Array([
-                                                                                        1,
-                                                                                        2,
-                                                                                        3
-                                                                                      ]).toString()
-                                                                              };
+                                                                          TAG: "Eq",
+                                                                          _0: "1,2,3",
+                                                                          _1: new Int8Array([
+                                                                                  1,
+                                                                                  2,
+                                                                                  3
+                                                                                ]).toString()
+                                                                        };
                                                                       })
                                                                   ],
                                                                   tl: {
@@ -657,14 +657,14 @@ var suites_1 = {
                                                                       "typed_array - toLocaleString",
                                                                       (function (param) {
                                                                           return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: "1,2,3",
-                                                                                  _1: new Int8Array([
-                                                                                          1,
-                                                                                          2,
-                                                                                          3
-                                                                                        ]).toLocaleString()
-                                                                                };
+                                                                            TAG: "Eq",
+                                                                            _0: "1,2,3",
+                                                                            _1: new Int8Array([
+                                                                                    1,
+                                                                                    2,
+                                                                                    3
+                                                                                  ]).toLocaleString()
+                                                                          };
                                                                         })
                                                                     ],
                                                                     tl: {
@@ -672,16 +672,16 @@ var suites_1 = {
                                                                         "typed_array - every",
                                                                         (function (param) {
                                                                             return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: true,
-                                                                                    _1: Js_typed_array.$$Int8Array.every((function (n) {
-                                                                                            return n > 0;
-                                                                                          }), new Int8Array([
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ]))
-                                                                                  };
+                                                                              TAG: "Eq",
+                                                                              _0: true,
+                                                                              _1: Js_typed_array.$$Int8Array.every((function (n) {
+                                                                                      return n > 0;
+                                                                                    }), new Int8Array([
+                                                                                        1,
+                                                                                        2,
+                                                                                        3
+                                                                                      ]))
+                                                                            };
                                                                           })
                                                                       ],
                                                                       tl: {
@@ -689,16 +689,16 @@ var suites_1 = {
                                                                           "typed_array - everyi",
                                                                           (function (param) {
                                                                               return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: false,
-                                                                                      _1: Js_typed_array.$$Int8Array.everyi((function (param, i) {
-                                                                                              return i > 0;
-                                                                                            }), new Int8Array([
-                                                                                                1,
-                                                                                                2,
-                                                                                                3
-                                                                                              ]))
-                                                                                    };
+                                                                                TAG: "Eq",
+                                                                                _0: false,
+                                                                                _1: Js_typed_array.$$Int8Array.everyi((function (param, i) {
+                                                                                        return i > 0;
+                                                                                      }), new Int8Array([
+                                                                                          1,
+                                                                                          2,
+                                                                                          3
+                                                                                        ]))
+                                                                              };
                                                                             })
                                                                         ],
                                                                         tl: {
@@ -706,20 +706,20 @@ var suites_1 = {
                                                                             "typed_array - filter",
                                                                             (function (param) {
                                                                                 return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: new Int8Array([
-                                                                                              2,
-                                                                                              4
-                                                                                            ]),
-                                                                                        _1: Js_typed_array.$$Int8Array.filter((function (n) {
-                                                                                                return n % 2 === 0;
-                                                                                              }), new Int8Array([
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3,
-                                                                                                  4
-                                                                                                ]))
-                                                                                      };
+                                                                                  TAG: "Eq",
+                                                                                  _0: new Int8Array([
+                                                                                        2,
+                                                                                        4
+                                                                                      ]),
+                                                                                  _1: Js_typed_array.$$Int8Array.filter((function (n) {
+                                                                                          return n % 2 === 0;
+                                                                                        }), new Int8Array([
+                                                                                            1,
+                                                                                            2,
+                                                                                            3,
+                                                                                            4
+                                                                                          ]))
+                                                                                };
                                                                               })
                                                                           ],
                                                                           tl: {
@@ -727,20 +727,20 @@ var suites_1 = {
                                                                               "typed_array - filteri",
                                                                               (function (param) {
                                                                                   return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: new Int8Array([
-                                                                                                1,
-                                                                                                3
-                                                                                              ]),
-                                                                                          _1: Js_typed_array.$$Int8Array.filteri((function (param, i) {
-                                                                                                  return i % 2 === 0;
-                                                                                                }), new Int8Array([
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3,
-                                                                                                    4
-                                                                                                  ]))
-                                                                                        };
+                                                                                    TAG: "Eq",
+                                                                                    _0: new Int8Array([
+                                                                                          1,
+                                                                                          3
+                                                                                        ]),
+                                                                                    _1: Js_typed_array.$$Int8Array.filteri((function (param, i) {
+                                                                                            return i % 2 === 0;
+                                                                                          }), new Int8Array([
+                                                                                              1,
+                                                                                              2,
+                                                                                              3,
+                                                                                              4
+                                                                                            ]))
+                                                                                  };
                                                                                 })
                                                                             ],
                                                                             tl: {
@@ -748,17 +748,17 @@ var suites_1 = {
                                                                                 "typed_array - find",
                                                                                 (function (param) {
                                                                                     return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 2,
-                                                                                            _1: Js_typed_array.$$Int8Array.find((function (n) {
-                                                                                                    return n % 2 === 0;
-                                                                                                  }), new Int8Array([
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3,
-                                                                                                      4
-                                                                                                    ]))
-                                                                                          };
+                                                                                      TAG: "Eq",
+                                                                                      _0: 2,
+                                                                                      _1: Js_typed_array.$$Int8Array.find((function (n) {
+                                                                                              return n % 2 === 0;
+                                                                                            }), new Int8Array([
+                                                                                                1,
+                                                                                                2,
+                                                                                                3,
+                                                                                                4
+                                                                                              ]))
+                                                                                    };
                                                                                   })
                                                                               ],
                                                                               tl: {
@@ -766,17 +766,17 @@ var suites_1 = {
                                                                                   "typed_array - findi",
                                                                                   (function (param) {
                                                                                       return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 1,
-                                                                                              _1: Js_typed_array.$$Int8Array.findi((function (param, i) {
-                                                                                                      return i % 2 === 0;
-                                                                                                    }), new Int8Array([
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3,
-                                                                                                        4
-                                                                                                      ]))
-                                                                                            };
+                                                                                        TAG: "Eq",
+                                                                                        _0: 1,
+                                                                                        _1: Js_typed_array.$$Int8Array.findi((function (param, i) {
+                                                                                                return i % 2 === 0;
+                                                                                              }), new Int8Array([
+                                                                                                  1,
+                                                                                                  2,
+                                                                                                  3,
+                                                                                                  4
+                                                                                                ]))
+                                                                                      };
                                                                                     })
                                                                                 ],
                                                                                 tl: {
@@ -784,17 +784,17 @@ var suites_1 = {
                                                                                     "typed_array - findIndex",
                                                                                     (function (param) {
                                                                                         return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 1,
-                                                                                                _1: Js_typed_array.$$Int8Array.findIndex((function (n) {
-                                                                                                        return n % 2 === 0;
-                                                                                                      }), new Int8Array([
-                                                                                                          1,
-                                                                                                          2,
-                                                                                                          3,
-                                                                                                          4
-                                                                                                        ]))
-                                                                                              };
+                                                                                          TAG: "Eq",
+                                                                                          _0: 1,
+                                                                                          _1: Js_typed_array.$$Int8Array.findIndex((function (n) {
+                                                                                                  return n % 2 === 0;
+                                                                                                }), new Int8Array([
+                                                                                                    1,
+                                                                                                    2,
+                                                                                                    3,
+                                                                                                    4
+                                                                                                  ]))
+                                                                                        };
                                                                                       })
                                                                                   ],
                                                                                   tl: {
@@ -802,17 +802,17 @@ var suites_1 = {
                                                                                       "typed_array - findIndexi",
                                                                                       (function (param) {
                                                                                           return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: 0,
-                                                                                                  _1: Js_typed_array.$$Int8Array.findIndexi((function (param, i) {
-                                                                                                          return i % 2 === 0;
-                                                                                                        }), new Int8Array([
-                                                                                                            1,
-                                                                                                            2,
-                                                                                                            3,
-                                                                                                            4
-                                                                                                          ]))
-                                                                                                };
+                                                                                            TAG: "Eq",
+                                                                                            _0: 0,
+                                                                                            _1: Js_typed_array.$$Int8Array.findIndexi((function (param, i) {
+                                                                                                    return i % 2 === 0;
+                                                                                                  }), new Int8Array([
+                                                                                                      1,
+                                                                                                      2,
+                                                                                                      3,
+                                                                                                      4
+                                                                                                    ]))
+                                                                                          };
                                                                                         })
                                                                                     ],
                                                                                     tl: {
@@ -830,10 +830,10 @@ var suites_1 = {
                                                                                                       3
                                                                                                     ]));
                                                                                             return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 6,
-                                                                                                    _1: sum.contents
-                                                                                                  };
+                                                                                              TAG: "Eq",
+                                                                                              _0: 6,
+                                                                                              _1: sum.contents
+                                                                                            };
                                                                                           })
                                                                                       ],
                                                                                       tl: {
@@ -851,10 +851,10 @@ var suites_1 = {
                                                                                                         3
                                                                                                       ]));
                                                                                               return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: 3,
-                                                                                                      _1: sum.contents
-                                                                                                    };
+                                                                                                TAG: "Eq",
+                                                                                                _0: 3,
+                                                                                                _1: sum.contents
+                                                                                              };
                                                                                             })
                                                                                         ],
                                                                                         tl: {
@@ -862,22 +862,22 @@ var suites_1 = {
                                                                                             "typed_array - map",
                                                                                             (function (param) {
                                                                                                 return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: new Int8Array([
-                                                                                                              2,
-                                                                                                              4,
-                                                                                                              6,
-                                                                                                              8
-                                                                                                            ]),
-                                                                                                        _1: Js_typed_array.$$Int8Array.map((function (n) {
-                                                                                                                return (n << 1);
-                                                                                                              }), new Int8Array([
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ]))
-                                                                                                      };
+                                                                                                  TAG: "Eq",
+                                                                                                  _0: new Int8Array([
+                                                                                                        2,
+                                                                                                        4,
+                                                                                                        6,
+                                                                                                        8
+                                                                                                      ]),
+                                                                                                  _1: Js_typed_array.$$Int8Array.map((function (n) {
+                                                                                                          return (n << 1);
+                                                                                                        }), new Int8Array([
+                                                                                                            1,
+                                                                                                            2,
+                                                                                                            3,
+                                                                                                            4
+                                                                                                          ]))
+                                                                                                };
                                                                                               })
                                                                                           ],
                                                                                           tl: {
@@ -885,22 +885,22 @@ var suites_1 = {
                                                                                               "typed_array - map",
                                                                                               (function (param) {
                                                                                                   return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: new Int8Array([
-                                                                                                                0,
-                                                                                                                2,
-                                                                                                                4,
-                                                                                                                6
-                                                                                                              ]),
-                                                                                                          _1: Js_typed_array.$$Int8Array.mapi((function (param, i) {
-                                                                                                                  return (i << 1);
-                                                                                                                }), new Int8Array([
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ]))
-                                                                                                        };
+                                                                                                    TAG: "Eq",
+                                                                                                    _0: new Int8Array([
+                                                                                                          0,
+                                                                                                          2,
+                                                                                                          4,
+                                                                                                          6
+                                                                                                        ]),
+                                                                                                    _1: Js_typed_array.$$Int8Array.mapi((function (param, i) {
+                                                                                                            return (i << 1);
+                                                                                                          }), new Int8Array([
+                                                                                                              1,
+                                                                                                              2,
+                                                                                                              3,
+                                                                                                              4
+                                                                                                            ]))
+                                                                                                  };
                                                                                                 })
                                                                                             ],
                                                                                             tl: {
@@ -908,17 +908,17 @@ var suites_1 = {
                                                                                                 "typed_array - reduce",
                                                                                                 (function (param) {
                                                                                                     return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: -10,
-                                                                                                            _1: Js_typed_array.$$Int8Array.reduce((function (acc, n) {
-                                                                                                                    return acc - n | 0;
-                                                                                                                  }), 0, new Int8Array([
-                                                                                                                      1,
-                                                                                                                      2,
-                                                                                                                      3,
-                                                                                                                      4
-                                                                                                                    ]))
-                                                                                                          };
+                                                                                                      TAG: "Eq",
+                                                                                                      _0: -10,
+                                                                                                      _1: Js_typed_array.$$Int8Array.reduce((function (acc, n) {
+                                                                                                              return acc - n | 0;
+                                                                                                            }), 0, new Int8Array([
+                                                                                                                1,
+                                                                                                                2,
+                                                                                                                3,
+                                                                                                                4
+                                                                                                              ]))
+                                                                                                    };
                                                                                                   })
                                                                                               ],
                                                                                               tl: {
@@ -926,17 +926,17 @@ var suites_1 = {
                                                                                                   "typed_array - reducei",
                                                                                                   (function (param) {
                                                                                                       return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: -6,
-                                                                                                              _1: Js_typed_array.$$Int8Array.reducei((function (acc, param, i) {
-                                                                                                                      return acc - i | 0;
-                                                                                                                    }), 0, new Int8Array([
-                                                                                                                        1,
-                                                                                                                        2,
-                                                                                                                        3,
-                                                                                                                        4
-                                                                                                                      ]))
-                                                                                                            };
+                                                                                                        TAG: "Eq",
+                                                                                                        _0: -6,
+                                                                                                        _1: Js_typed_array.$$Int8Array.reducei((function (acc, param, i) {
+                                                                                                                return acc - i | 0;
+                                                                                                              }), 0, new Int8Array([
+                                                                                                                  1,
+                                                                                                                  2,
+                                                                                                                  3,
+                                                                                                                  4
+                                                                                                                ]))
+                                                                                                      };
                                                                                                     })
                                                                                                 ],
                                                                                                 tl: {
@@ -944,17 +944,17 @@ var suites_1 = {
                                                                                                     "typed_array - reduceRight",
                                                                                                     (function (param) {
                                                                                                         return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: -10,
-                                                                                                                _1: Js_typed_array.$$Int8Array.reduceRight((function (acc, n) {
-                                                                                                                        return acc - n | 0;
-                                                                                                                      }), 0, new Int8Array([
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ]))
-                                                                                                              };
+                                                                                                          TAG: "Eq",
+                                                                                                          _0: -10,
+                                                                                                          _1: Js_typed_array.$$Int8Array.reduceRight((function (acc, n) {
+                                                                                                                  return acc - n | 0;
+                                                                                                                }), 0, new Int8Array([
+                                                                                                                    1,
+                                                                                                                    2,
+                                                                                                                    3,
+                                                                                                                    4
+                                                                                                                  ]))
+                                                                                                        };
                                                                                                       })
                                                                                                   ],
                                                                                                   tl: {
@@ -962,17 +962,17 @@ var suites_1 = {
                                                                                                       "typed_array - reduceRighti",
                                                                                                       (function (param) {
                                                                                                           return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: -6,
-                                                                                                                  _1: Js_typed_array.$$Int8Array.reduceRighti((function (acc, param, i) {
-                                                                                                                          return acc - i | 0;
-                                                                                                                        }), 0, new Int8Array([
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ]))
-                                                                                                                };
+                                                                                                            TAG: "Eq",
+                                                                                                            _0: -6,
+                                                                                                            _1: Js_typed_array.$$Int8Array.reduceRighti((function (acc, param, i) {
+                                                                                                                    return acc - i | 0;
+                                                                                                                  }), 0, new Int8Array([
+                                                                                                                      1,
+                                                                                                                      2,
+                                                                                                                      3,
+                                                                                                                      4
+                                                                                                                    ]))
+                                                                                                          };
                                                                                                         })
                                                                                                     ],
                                                                                                     tl: {
@@ -980,17 +980,17 @@ var suites_1 = {
                                                                                                         "typed_array - some",
                                                                                                         (function (param) {
                                                                                                             return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: false,
-                                                                                                                    _1: Js_typed_array.$$Int8Array.some((function (n) {
-                                                                                                                            return n <= 0;
-                                                                                                                          }), new Int8Array([
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ]))
-                                                                                                                  };
+                                                                                                              TAG: "Eq",
+                                                                                                              _0: false,
+                                                                                                              _1: Js_typed_array.$$Int8Array.some((function (n) {
+                                                                                                                      return n <= 0;
+                                                                                                                    }), new Int8Array([
+                                                                                                                        1,
+                                                                                                                        2,
+                                                                                                                        3,
+                                                                                                                        4
+                                                                                                                      ]))
+                                                                                                            };
                                                                                                           })
                                                                                                       ],
                                                                                                       tl: {
@@ -998,17 +998,17 @@ var suites_1 = {
                                                                                                           "typed_array - somei",
                                                                                                           (function (param) {
                                                                                                               return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: true,
-                                                                                                                      _1: Js_typed_array.$$Int8Array.somei((function (param, i) {
-                                                                                                                              return i <= 0;
-                                                                                                                            }), new Int8Array([
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3,
-                                                                                                                                4
-                                                                                                                              ]))
-                                                                                                                    };
+                                                                                                                TAG: "Eq",
+                                                                                                                _0: true,
+                                                                                                                _1: Js_typed_array.$$Int8Array.somei((function (param, i) {
+                                                                                                                        return i <= 0;
+                                                                                                                      }), new Int8Array([
+                                                                                                                          1,
+                                                                                                                          2,
+                                                                                                                          3,
+                                                                                                                          4
+                                                                                                                        ]))
+                                                                                                              };
                                                                                                             })
                                                                                                         ],
                                                                                                         tl: {
@@ -1016,10 +1016,10 @@ var suites_1 = {
                                                                                                             "int8_array - _BYTES_PER_ELEMENT",
                                                                                                             (function (param) {
                                                                                                                 return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: 1,
-                                                                                                                        _1: Int8Array.BYTES_PER_ELEMENT
-                                                                                                                      };
+                                                                                                                  TAG: "Eq",
+                                                                                                                  _0: 1,
+                                                                                                                  _1: Int8Array.BYTES_PER_ELEMENT
+                                                                                                                };
                                                                                                               })
                                                                                                           ],
                                                                                                           tl: {
@@ -1027,14 +1027,14 @@ var suites_1 = {
                                                                                                               "int8_array - make",
                                                                                                               (function (param) {
                                                                                                                   return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: 3,
-                                                                                                                          _1: new Int8Array([
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3
-                                                                                                                              ]).byteLength
-                                                                                                                        };
+                                                                                                                    TAG: "Eq",
+                                                                                                                    _0: 3,
+                                                                                                                    _1: new Int8Array([
+                                                                                                                          1,
+                                                                                                                          2,
+                                                                                                                          3
+                                                                                                                        ]).byteLength
+                                                                                                                  };
                                                                                                                 })
                                                                                                             ],
                                                                                                             tl: {
@@ -1042,10 +1042,10 @@ var suites_1 = {
                                                                                                                 "int8_array - fromBuffer",
                                                                                                                 (function (param) {
                                                                                                                     return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: 32,
-                                                                                                                            _1: new Int8Array(new ArrayBuffer(32)).byteLength
-                                                                                                                          };
+                                                                                                                      TAG: "Eq",
+                                                                                                                      _0: 32,
+                                                                                                                      _1: new Int8Array(new ArrayBuffer(32)).byteLength
+                                                                                                                    };
                                                                                                                   })
                                                                                                               ],
                                                                                                               tl: {
@@ -1054,10 +1054,10 @@ var suites_1 = {
                                                                                                                   (function (param) {
                                                                                                                       var buffer = new ArrayBuffer(32);
                                                                                                                       return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 24,
-                                                                                                                              _1: new Int8Array(buffer, 8).byteLength
-                                                                                                                            };
+                                                                                                                        TAG: "Eq",
+                                                                                                                        _0: 24,
+                                                                                                                        _1: new Int8Array(buffer, 8).byteLength
+                                                                                                                      };
                                                                                                                     })
                                                                                                                 ],
                                                                                                                 tl: {
@@ -1066,10 +1066,10 @@ var suites_1 = {
                                                                                                                     (function (param) {
                                                                                                                         var buffer = new ArrayBuffer(32);
                                                                                                                         return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: 2,
-                                                                                                                                _1: new Int8Array(buffer, 8, 2).byteLength
-                                                                                                                              };
+                                                                                                                          TAG: "Eq",
+                                                                                                                          _0: 2,
+                                                                                                                          _1: new Int8Array(buffer, 8, 2).byteLength
+                                                                                                                        };
                                                                                                                       })
                                                                                                                   ],
                                                                                                                   tl: {
@@ -1077,10 +1077,10 @@ var suites_1 = {
                                                                                                                       "int8_array - fromLength",
                                                                                                                       (function (param) {
                                                                                                                           return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: 3,
-                                                                                                                                  _1: new Int8Array(3).byteLength
-                                                                                                                                };
+                                                                                                                            TAG: "Eq",
+                                                                                                                            _0: 3,
+                                                                                                                            _1: new Int8Array(3).byteLength
+                                                                                                                          };
                                                                                                                         })
                                                                                                                     ],
                                                                                                                     tl: {
@@ -1096,10 +1096,10 @@ var suites_1 = {
                                                                                                                                 ]);
                                                                                                                             a[3] = 14;
                                                                                                                             return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: 14,
-                                                                                                                                    _1: a[3]
-                                                                                                                                  };
+                                                                                                                              TAG: "Eq",
+                                                                                                                              _0: 14,
+                                                                                                                              _1: a[3]
+                                                                                                                            };
                                                                                                                           })
                                                                                                                       ],
                                                                                                                       tl: {
@@ -1107,10 +1107,10 @@ var suites_1 = {
                                                                                                                           "uint8_array - _BYTES_PER_ELEMENT",
                                                                                                                           (function (param) {
                                                                                                                               return {
-                                                                                                                                      TAG: "Eq",
-                                                                                                                                      _0: 1,
-                                                                                                                                      _1: Uint8Array.BYTES_PER_ELEMENT
-                                                                                                                                    };
+                                                                                                                                TAG: "Eq",
+                                                                                                                                _0: 1,
+                                                                                                                                _1: Uint8Array.BYTES_PER_ELEMENT
+                                                                                                                              };
                                                                                                                             })
                                                                                                                         ],
                                                                                                                         tl: {
@@ -1118,14 +1118,14 @@ var suites_1 = {
                                                                                                                             "uint8_array - make",
                                                                                                                             (function (param) {
                                                                                                                                 return {
-                                                                                                                                        TAG: "Eq",
-                                                                                                                                        _0: 3,
-                                                                                                                                        _1: new Uint8Array([
-                                                                                                                                              1,
-                                                                                                                                              2,
-                                                                                                                                              3
-                                                                                                                                            ]).byteLength
-                                                                                                                                      };
+                                                                                                                                  TAG: "Eq",
+                                                                                                                                  _0: 3,
+                                                                                                                                  _1: new Uint8Array([
+                                                                                                                                        1,
+                                                                                                                                        2,
+                                                                                                                                        3
+                                                                                                                                      ]).byteLength
+                                                                                                                                };
                                                                                                                               })
                                                                                                                           ],
                                                                                                                           tl: {
@@ -1133,10 +1133,10 @@ var suites_1 = {
                                                                                                                               "uint8_array - fromBuffer",
                                                                                                                               (function (param) {
                                                                                                                                   return {
-                                                                                                                                          TAG: "Eq",
-                                                                                                                                          _0: 32,
-                                                                                                                                          _1: new Uint8Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                        };
+                                                                                                                                    TAG: "Eq",
+                                                                                                                                    _0: 32,
+                                                                                                                                    _1: new Uint8Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                  };
                                                                                                                                 })
                                                                                                                             ],
                                                                                                                             tl: {
@@ -1145,10 +1145,10 @@ var suites_1 = {
                                                                                                                                 (function (param) {
                                                                                                                                     var buffer = new ArrayBuffer(32);
                                                                                                                                     return {
-                                                                                                                                            TAG: "Eq",
-                                                                                                                                            _0: 24,
-                                                                                                                                            _1: new Uint8Array(buffer, 8).byteLength
-                                                                                                                                          };
+                                                                                                                                      TAG: "Eq",
+                                                                                                                                      _0: 24,
+                                                                                                                                      _1: new Uint8Array(buffer, 8).byteLength
+                                                                                                                                    };
                                                                                                                                   })
                                                                                                                               ],
                                                                                                                               tl: {
@@ -1157,10 +1157,10 @@ var suites_1 = {
                                                                                                                                   (function (param) {
                                                                                                                                       var buffer = new ArrayBuffer(32);
                                                                                                                                       return {
-                                                                                                                                              TAG: "Eq",
-                                                                                                                                              _0: 2,
-                                                                                                                                              _1: new Uint8Array(buffer, 8, 2).byteLength
-                                                                                                                                            };
+                                                                                                                                        TAG: "Eq",
+                                                                                                                                        _0: 2,
+                                                                                                                                        _1: new Uint8Array(buffer, 8, 2).byteLength
+                                                                                                                                      };
                                                                                                                                     })
                                                                                                                                 ],
                                                                                                                                 tl: {
@@ -1168,10 +1168,10 @@ var suites_1 = {
                                                                                                                                     "uint8_array - fromLength",
                                                                                                                                     (function (param) {
                                                                                                                                         return {
-                                                                                                                                                TAG: "Eq",
-                                                                                                                                                _0: 3,
-                                                                                                                                                _1: new Uint8Array(3).byteLength
-                                                                                                                                              };
+                                                                                                                                          TAG: "Eq",
+                                                                                                                                          _0: 3,
+                                                                                                                                          _1: new Uint8Array(3).byteLength
+                                                                                                                                        };
                                                                                                                                       })
                                                                                                                                   ],
                                                                                                                                   tl: {
@@ -1187,10 +1187,10 @@ var suites_1 = {
                                                                                                                                               ]);
                                                                                                                                           a[3] = 14;
                                                                                                                                           return {
-                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                  _0: 14,
-                                                                                                                                                  _1: a[3]
-                                                                                                                                                };
+                                                                                                                                            TAG: "Eq",
+                                                                                                                                            _0: 14,
+                                                                                                                                            _1: a[3]
+                                                                                                                                          };
                                                                                                                                         })
                                                                                                                                     ],
                                                                                                                                     tl: {
@@ -1198,10 +1198,10 @@ var suites_1 = {
                                                                                                                                         "uint8clamped_array - _BYTES_PER_ELEMENT",
                                                                                                                                         (function (param) {
                                                                                                                                             return {
-                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                    _0: 1,
-                                                                                                                                                    _1: Uint8ClampedArray.BYTES_PER_ELEMENT
-                                                                                                                                                  };
+                                                                                                                                              TAG: "Eq",
+                                                                                                                                              _0: 1,
+                                                                                                                                              _1: Uint8ClampedArray.BYTES_PER_ELEMENT
+                                                                                                                                            };
                                                                                                                                           })
                                                                                                                                       ],
                                                                                                                                       tl: {
@@ -1209,14 +1209,14 @@ var suites_1 = {
                                                                                                                                           "uint8clamped_array - make",
                                                                                                                                           (function (param) {
                                                                                                                                               return {
-                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                      _0: 3,
-                                                                                                                                                      _1: new Uint8ClampedArray([
-                                                                                                                                                            1,
-                                                                                                                                                            2,
-                                                                                                                                                            3
-                                                                                                                                                          ]).byteLength
-                                                                                                                                                    };
+                                                                                                                                                TAG: "Eq",
+                                                                                                                                                _0: 3,
+                                                                                                                                                _1: new Uint8ClampedArray([
+                                                                                                                                                      1,
+                                                                                                                                                      2,
+                                                                                                                                                      3
+                                                                                                                                                    ]).byteLength
+                                                                                                                                              };
                                                                                                                                             })
                                                                                                                                         ],
                                                                                                                                         tl: {
@@ -1224,10 +1224,10 @@ var suites_1 = {
                                                                                                                                             "uint8clamped_array - fromBuffer",
                                                                                                                                             (function (param) {
                                                                                                                                                 return {
-                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                        _0: 32,
-                                                                                                                                                        _1: new Uint8ClampedArray(new ArrayBuffer(32)).byteLength
-                                                                                                                                                      };
+                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                  _0: 32,
+                                                                                                                                                  _1: new Uint8ClampedArray(new ArrayBuffer(32)).byteLength
+                                                                                                                                                };
                                                                                                                                               })
                                                                                                                                           ],
                                                                                                                                           tl: {
@@ -1236,10 +1236,10 @@ var suites_1 = {
                                                                                                                                               (function (param) {
                                                                                                                                                   var buffer = new ArrayBuffer(32);
                                                                                                                                                   return {
-                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                          _0: 24,
-                                                                                                                                                          _1: new Uint8ClampedArray(buffer, 8).byteLength
-                                                                                                                                                        };
+                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                    _0: 24,
+                                                                                                                                                    _1: new Uint8ClampedArray(buffer, 8).byteLength
+                                                                                                                                                  };
                                                                                                                                                 })
                                                                                                                                             ],
                                                                                                                                             tl: {
@@ -1248,10 +1248,10 @@ var suites_1 = {
                                                                                                                                                 (function (param) {
                                                                                                                                                     var buffer = new ArrayBuffer(32);
                                                                                                                                                     return {
-                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                            _0: 2,
-                                                                                                                                                            _1: new Uint8ClampedArray(buffer, 8, 2).byteLength
-                                                                                                                                                          };
+                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                      _0: 2,
+                                                                                                                                                      _1: new Uint8ClampedArray(buffer, 8, 2).byteLength
+                                                                                                                                                    };
                                                                                                                                                   })
                                                                                                                                               ],
                                                                                                                                               tl: {
@@ -1259,10 +1259,10 @@ var suites_1 = {
                                                                                                                                                   "uint8clamped_array - fromLength",
                                                                                                                                                   (function (param) {
                                                                                                                                                       return {
-                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                              _0: 3,
-                                                                                                                                                              _1: new Uint8ClampedArray(3).byteLength
-                                                                                                                                                            };
+                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                        _0: 3,
+                                                                                                                                                        _1: new Uint8ClampedArray(3).byteLength
+                                                                                                                                                      };
                                                                                                                                                     })
                                                                                                                                                 ],
                                                                                                                                                 tl: {
@@ -1278,10 +1278,10 @@ var suites_1 = {
                                                                                                                                                             ]);
                                                                                                                                                         a[3] = 14;
                                                                                                                                                         return {
-                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                _0: 14,
-                                                                                                                                                                _1: a[3]
-                                                                                                                                                              };
+                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                          _0: 14,
+                                                                                                                                                          _1: a[3]
+                                                                                                                                                        };
                                                                                                                                                       })
                                                                                                                                                   ],
                                                                                                                                                   tl: {
@@ -1289,10 +1289,10 @@ var suites_1 = {
                                                                                                                                                       "int16_array - _BYTES_PER_ELEMENT",
                                                                                                                                                       (function (param) {
                                                                                                                                                           return {
-                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                  _0: 2,
-                                                                                                                                                                  _1: Int16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                };
+                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                            _0: 2,
+                                                                                                                                                            _1: Int16Array.BYTES_PER_ELEMENT
+                                                                                                                                                          };
                                                                                                                                                         })
                                                                                                                                                     ],
                                                                                                                                                     tl: {
@@ -1300,14 +1300,14 @@ var suites_1 = {
                                                                                                                                                         "int16_array - make",
                                                                                                                                                         (function (param) {
                                                                                                                                                             return {
-                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                    _0: 6,
-                                                                                                                                                                    _1: new Int16Array([
-                                                                                                                                                                          1,
-                                                                                                                                                                          2,
-                                                                                                                                                                          3
-                                                                                                                                                                        ]).byteLength
-                                                                                                                                                                  };
+                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                              _0: 6,
+                                                                                                                                                              _1: new Int16Array([
+                                                                                                                                                                    1,
+                                                                                                                                                                    2,
+                                                                                                                                                                    3
+                                                                                                                                                                  ]).byteLength
+                                                                                                                                                            };
                                                                                                                                                           })
                                                                                                                                                       ],
                                                                                                                                                       tl: {
@@ -1315,10 +1315,10 @@ var suites_1 = {
                                                                                                                                                           "int16_array - fromBuffer",
                                                                                                                                                           (function (param) {
                                                                                                                                                               return {
-                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                      _0: 32,
-                                                                                                                                                                      _1: new Int16Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                    };
+                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                _0: 32,
+                                                                                                                                                                _1: new Int16Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                              };
                                                                                                                                                             })
                                                                                                                                                         ],
                                                                                                                                                         tl: {
@@ -1327,10 +1327,10 @@ var suites_1 = {
                                                                                                                                                             (function (param) {
                                                                                                                                                                 var buffer = new ArrayBuffer(32);
                                                                                                                                                                 return {
-                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                        _0: 24,
-                                                                                                                                                                        _1: new Int16Array(buffer, 8).byteLength
-                                                                                                                                                                      };
+                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                  _0: 24,
+                                                                                                                                                                  _1: new Int16Array(buffer, 8).byteLength
+                                                                                                                                                                };
                                                                                                                                                               })
                                                                                                                                                           ],
                                                                                                                                                           tl: {
@@ -1339,10 +1339,10 @@ var suites_1 = {
                                                                                                                                                               (function (param) {
                                                                                                                                                                   var buffer = new ArrayBuffer(32);
                                                                                                                                                                   return {
-                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                          _0: 4,
-                                                                                                                                                                          _1: new Int16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                        };
+                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                    _0: 4,
+                                                                                                                                                                    _1: new Int16Array(buffer, 8, 2).byteLength
+                                                                                                                                                                  };
                                                                                                                                                                 })
                                                                                                                                                             ],
                                                                                                                                                             tl: {
@@ -1350,10 +1350,10 @@ var suites_1 = {
                                                                                                                                                                 "int16_array - fromLength",
                                                                                                                                                                 (function (param) {
                                                                                                                                                                     return {
-                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                            _0: 6,
-                                                                                                                                                                            _1: new Int16Array(3).byteLength
-                                                                                                                                                                          };
+                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                      _0: 6,
+                                                                                                                                                                      _1: new Int16Array(3).byteLength
+                                                                                                                                                                    };
                                                                                                                                                                   })
                                                                                                                                                               ],
                                                                                                                                                               tl: {
@@ -1368,11 +1368,11 @@ var suites_1 = {
                                                                                                                                                                             5
                                                                                                                                                                           ]);
                                                                                                                                                                       a[3] = 14;
-                                                                                                                                                                      return {
-                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                              _0: 14,
-                                                                                                                                                                              _1: a[3]
-                                                                                                                                                                            };
+                                                                                                                                                                      return {
+                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                        _0: 14,
+                                                                                                                                                                        _1: a[3]
+                                                                                                                                                                      };
                                                                                                                                                                     })
                                                                                                                                                                 ],
                                                                                                                                                                 tl: {
@@ -1380,10 +1380,10 @@ var suites_1 = {
                                                                                                                                                                     "uint16_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                     (function (param) {
                                                                                                                                                                         return {
-                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                _0: 2,
-                                                                                                                                                                                _1: Uint16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                              };
+                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                          _0: 2,
+                                                                                                                                                                          _1: Uint16Array.BYTES_PER_ELEMENT
+                                                                                                                                                                        };
                                                                                                                                                                       })
                                                                                                                                                                   ],
                                                                                                                                                                   tl: {
@@ -1391,14 +1391,14 @@ var suites_1 = {
                                                                                                                                                                       "uint16_array - make",
                                                                                                                                                                       (function (param) {
                                                                                                                                                                           return {
-                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                  _0: 6,
-                                                                                                                                                                                  _1: new Uint16Array([
-                                                                                                                                                                                        1,
-                                                                                                                                                                                        2,
-                                                                                                                                                                                        3
-                                                                                                                                                                                      ]).byteLength
-                                                                                                                                                                                };
+                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                            _0: 6,
+                                                                                                                                                                            _1: new Uint16Array([
+                                                                                                                                                                                  1,
+                                                                                                                                                                                  2,
+                                                                                                                                                                                  3
+                                                                                                                                                                                ]).byteLength
+                                                                                                                                                                          };
                                                                                                                                                                         })
                                                                                                                                                                     ],
                                                                                                                                                                     tl: {
@@ -1406,10 +1406,10 @@ var suites_1 = {
                                                                                                                                                                         "uint16_array - fromBuffer",
                                                                                                                                                                         (function (param) {
                                                                                                                                                                             return {
-                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                    _0: 32,
-                                                                                                                                                                                    _1: new Uint16Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                  };
+                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                              _0: 32,
+                                                                                                                                                                              _1: new Uint16Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                            };
                                                                                                                                                                           })
                                                                                                                                                                       ],
                                                                                                                                                                       tl: {
@@ -1418,10 +1418,10 @@ var suites_1 = {
                                                                                                                                                                           (function (param) {
                                                                                                                                                                               var buffer = new ArrayBuffer(32);
                                                                                                                                                                               return {
-                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                      _0: 24,
-                                                                                                                                                                                      _1: new Uint16Array(buffer, 8).byteLength
-                                                                                                                                                                                    };
+                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                _0: 24,
+                                                                                                                                                                                _1: new Uint16Array(buffer, 8).byteLength
+                                                                                                                                                                              };
                                                                                                                                                                             })
                                                                                                                                                                         ],
                                                                                                                                                                         tl: {
@@ -1430,10 +1430,10 @@ var suites_1 = {
                                                                                                                                                                             (function (param) {
                                                                                                                                                                                 var buffer = new ArrayBuffer(32);
                                                                                                                                                                                 return {
-                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                        _0: 4,
-                                                                                                                                                                                        _1: new Uint16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                      };
+                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                  _0: 4,
+                                                                                                                                                                                  _1: new Uint16Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                };
                                                                                                                                                                               })
                                                                                                                                                                           ],
                                                                                                                                                                           tl: {
@@ -1441,10 +1441,10 @@ var suites_1 = {
                                                                                                                                                                               "uint16_array - fromLength",
                                                                                                                                                                               (function (param) {
                                                                                                                                                                                   return {
-                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                          _0: 6,
-                                                                                                                                                                                          _1: new Uint16Array(3).byteLength
-                                                                                                                                                                                        };
+                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                    _0: 6,
+                                                                                                                                                                                    _1: new Uint16Array(3).byteLength
+                                                                                                                                                                                  };
                                                                                                                                                                                 })
                                                                                                                                                                             ],
                                                                                                                                                                             tl: {
@@ -1460,10 +1460,10 @@ var suites_1 = {
                                                                                                                                                                                         ]);
                                                                                                                                                                                     a[3] = 14;
                                                                                                                                                                                     return {
-                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                            _0: 14,
-                                                                                                                                                                                            _1: a[3]
-                                                                                                                                                                                          };
+                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                      _0: 14,
+                                                                                                                                                                                      _1: a[3]
+                                                                                                                                                                                    };
                                                                                                                                                                                   })
                                                                                                                                                                               ],
                                                                                                                                                                               tl: {
@@ -1471,10 +1471,10 @@ var suites_1 = {
                                                                                                                                                                                   "int32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                       return {
-                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                              _0: 4,
-                                                                                                                                                                                              _1: Int32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                            };
+                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                        _0: 4,
+                                                                                                                                                                                        _1: Int32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                      };
                                                                                                                                                                                     })
                                                                                                                                                                                 ],
                                                                                                                                                                                 tl: {
@@ -1482,16 +1482,16 @@ var suites_1 = {
                                                                                                                                                                                     "int32_array - make",
                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                         return {
-                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                _0: 12,
-                                                                                                                                                                                                _1: new Int32Array($$Array.map((function (prim) {
-                                                                                                                                                                                                            return prim;
-                                                                                                                                                                                                          }), [
-                                                                                                                                                                                                          1,
-                                                                                                                                                                                                          2,
-                                                                                                                                                                                                          3
-                                                                                                                                                                                                        ])).byteLength
-                                                                                                                                                                                              };
+                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                          _0: 12,
+                                                                                                                                                                                          _1: new Int32Array($$Array.map((function (prim) {
+                                                                                                                                                                                                      return prim;
+                                                                                                                                                                                                    }), [
+                                                                                                                                                                                                    1,
+                                                                                                                                                                                                    2,
+                                                                                                                                                                                                    3
+                                                                                                                                                                                                  ])).byteLength
+                                                                                                                                                                                        };
                                                                                                                                                                                       })
                                                                                                                                                                                   ],
                                                                                                                                                                                   tl: {
@@ -1499,10 +1499,10 @@ var suites_1 = {
                                                                                                                                                                                       "int32_array - fromBuffer",
                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                           return {
-                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                  _0: 32,
-                                                                                                                                                                                                  _1: new Int32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                };
+                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                            _0: 32,
+                                                                                                                                                                                            _1: new Int32Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                          };
                                                                                                                                                                                         })
                                                                                                                                                                                     ],
                                                                                                                                                                                     tl: {
@@ -1511,10 +1511,10 @@ var suites_1 = {
                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                             var buffer = new ArrayBuffer(32);
                                                                                                                                                                                             return {
-                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                    _0: 24,
-                                                                                                                                                                                                    _1: new Int32Array(buffer, 8).byteLength
-                                                                                                                                                                                                  };
+                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                              _0: 24,
+                                                                                                                                                                                              _1: new Int32Array(buffer, 8).byteLength
+                                                                                                                                                                                            };
                                                                                                                                                                                           })
                                                                                                                                                                                       ],
                                                                                                                                                                                       tl: {
@@ -1523,10 +1523,10 @@ var suites_1 = {
                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                               var buffer = new ArrayBuffer(32);
                                                                                                                                                                                               return {
-                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                      _0: 8,
-                                                                                                                                                                                                      _1: new Int32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                    };
+                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                _0: 8,
+                                                                                                                                                                                                _1: new Int32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                              };
                                                                                                                                                                                             })
                                                                                                                                                                                         ],
                                                                                                                                                                                         tl: {
@@ -1534,10 +1534,10 @@ var suites_1 = {
                                                                                                                                                                                             "int32_array - fromLength",
                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                 return {
-                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                        _0: 12,
-                                                                                                                                                                                                        _1: new Int32Array(3).byteLength
-                                                                                                                                                                                                      };
+                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                  _0: 12,
+                                                                                                                                                                                                  _1: new Int32Array(3).byteLength
+                                                                                                                                                                                                };
                                                                                                                                                                                               })
                                                                                                                                                                                           ],
                                                                                                                                                                                           tl: {
@@ -1555,10 +1555,10 @@ var suites_1 = {
                                                                                                                                                                                                           ]));
                                                                                                                                                                                                   a[3] = 14;
                                                                                                                                                                                                   return {
-                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                          _0: 14,
-                                                                                                                                                                                                          _1: a[3]
-                                                                                                                                                                                                        };
+                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                    _0: 14,
+                                                                                                                                                                                                    _1: a[3]
+                                                                                                                                                                                                  };
                                                                                                                                                                                                 })
                                                                                                                                                                                             ],
                                                                                                                                                                                             tl: {
@@ -1566,10 +1566,10 @@ var suites_1 = {
                                                                                                                                                                                                 "uint32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                     return {
-                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                            _1: Uint32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                          };
+                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                      _0: 4,
+                                                                                                                                                                                                      _1: Uint32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                    };
                                                                                                                                                                                                   })
                                                                                                                                                                                               ],
                                                                                                                                                                                               tl: {
@@ -1577,14 +1577,14 @@ var suites_1 = {
                                                                                                                                                                                                   "uint32_array - make",
                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                       return {
-                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                              _0: 12,
-                                                                                                                                                                                                              _1: new Uint32Array([
-                                                                                                                                                                                                                    1,
-                                                                                                                                                                                                                    2,
-                                                                                                                                                                                                                    3
-                                                                                                                                                                                                                  ]).byteLength
-                                                                                                                                                                                                            };
+                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                        _0: 12,
+                                                                                                                                                                                                        _1: new Uint32Array([
+                                                                                                                                                                                                              1,
+                                                                                                                                                                                                              2,
+                                                                                                                                                                                                              3
+                                                                                                                                                                                                            ]).byteLength
+                                                                                                                                                                                                      };
                                                                                                                                                                                                     })
                                                                                                                                                                                                 ],
                                                                                                                                                                                                 tl: {
@@ -1592,10 +1592,10 @@ var suites_1 = {
                                                                                                                                                                                                     "uint32_array - fromBuffer",
                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                _0: 32,
-                                                                                                                                                                                                                _1: new Uint32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                              };
+                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                          _0: 32,
+                                                                                                                                                                                                          _1: new Uint32Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                        };
                                                                                                                                                                                                       })
                                                                                                                                                                                                   ],
                                                                                                                                                                                                   tl: {
@@ -1604,10 +1604,10 @@ var suites_1 = {
                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                           var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                  _1: new Uint32Array(buffer, 8).byteLength
-                                                                                                                                                                                                                };
+                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                            _0: 24,
+                                                                                                                                                                                                            _1: new Uint32Array(buffer, 8).byteLength
+                                                                                                                                                                                                          };
                                                                                                                                                                                                         })
                                                                                                                                                                                                     ],
                                                                                                                                                                                                     tl: {
@@ -1616,10 +1616,10 @@ var suites_1 = {
                                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                                             var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                    _0: 8,
-                                                                                                                                                                                                                    _1: new Uint32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                  };
+                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                              _0: 8,
+                                                                                                                                                                                                              _1: new Uint32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                            };
                                                                                                                                                                                                           })
                                                                                                                                                                                                       ],
                                                                                                                                                                                                       tl: {
@@ -1627,10 +1627,10 @@ var suites_1 = {
                                                                                                                                                                                                           "uint32_array - fromLength",
                                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                      _0: 12,
-                                                                                                                                                                                                                      _1: new Uint32Array(3).byteLength
-                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                _0: 12,
+                                                                                                                                                                                                                _1: new Uint32Array(3).byteLength
+                                                                                                                                                                                                              };
                                                                                                                                                                                                             })
                                                                                                                                                                                                         ],
                                                                                                                                                                                                         tl: {
@@ -1646,10 +1646,10 @@ var suites_1 = {
                                                                                                                                                                                                                     ]);
                                                                                                                                                                                                                 a[3] = 14;
                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                        _0: 14,
-                                                                                                                                                                                                                        _1: a[3]
-                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                  _0: 14,
+                                                                                                                                                                                                                  _1: a[3]
+                                                                                                                                                                                                                };
                                                                                                                                                                                                               })
                                                                                                                                                                                                           ],
                                                                                                                                                                                                           tl: {
@@ -1657,10 +1657,10 @@ var suites_1 = {
                                                                                                                                                                                                               "float32_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                          _0: 4,
-                                                                                                                                                                                                                          _1: Float32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                                    _0: 4,
+                                                                                                                                                                                                                    _1: Float32Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                                  };
                                                                                                                                                                                                                 })
                                                                                                                                                                                                             ],
                                                                                                                                                                                                             tl: {
@@ -1668,14 +1668,14 @@ var suites_1 = {
                                                                                                                                                                                                                 "float32_array - make",
                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                            _0: 12,
-                                                                                                                                                                                                                            _1: new Float32Array([
-                                                                                                                                                                                                                                  1,
-                                                                                                                                                                                                                                  2,
-                                                                                                                                                                                                                                  3
-                                                                                                                                                                                                                                ]).byteLength
-                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                                      _0: 12,
+                                                                                                                                                                                                                      _1: new Float32Array([
+                                                                                                                                                                                                                            1,
+                                                                                                                                                                                                                            2,
+                                                                                                                                                                                                                            3
+                                                                                                                                                                                                                          ]).byteLength
+                                                                                                                                                                                                                    };
                                                                                                                                                                                                                   })
                                                                                                                                                                                                               ],
                                                                                                                                                                                                               tl: {
@@ -1683,10 +1683,10 @@ var suites_1 = {
                                                                                                                                                                                                                   "float32_array - fromBuffer",
                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                              _0: 32,
-                                                                                                                                                                                                                              _1: new Float32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                                        _0: 32,
+                                                                                                                                                                                                                        _1: new Float32Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                                      };
                                                                                                                                                                                                                     })
                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                 tl: {
@@ -1695,10 +1695,10 @@ var suites_1 = {
                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                         var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                _0: 24,
-                                                                                                                                                                                                                                _1: new Float32Array(buffer, 8).byteLength
-                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                                          _0: 24,
+                                                                                                                                                                                                                          _1: new Float32Array(buffer, 8).byteLength
+                                                                                                                                                                                                                        };
                                                                                                                                                                                                                       })
                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                   tl: {
@@ -1707,10 +1707,10 @@ var suites_1 = {
                                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                                           var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                  _0: 8,
-                                                                                                                                                                                                                                  _1: new Float32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                                            _0: 8,
+                                                                                                                                                                                                                            _1: new Float32Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                                          };
                                                                                                                                                                                                                         })
                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                     tl: {
@@ -1718,10 +1718,10 @@ var suites_1 = {
                                                                                                                                                                                                                         "float32_array - fromLength",
                                                                                                                                                                                                                         (function (param) {
                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                    _0: 12,
-                                                                                                                                                                                                                                    _1: new Float32Array(3).byteLength
-                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                                              _0: 12,
+                                                                                                                                                                                                                              _1: new Float32Array(3).byteLength
+                                                                                                                                                                                                                            };
                                                                                                                                                                                                                           })
                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                       tl: {
@@ -1737,10 +1737,10 @@ var suites_1 = {
                                                                                                                                                                                                                                   ]);
                                                                                                                                                                                                                               a[3] = 14;
                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                      _0: 14,
-                                                                                                                                                                                                                                      _1: a[3]
-                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                                _0: 14,
+                                                                                                                                                                                                                                _1: a[3]
+                                                                                                                                                                                                                              };
                                                                                                                                                                                                                             })
                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                         tl: {
@@ -1748,10 +1748,10 @@ var suites_1 = {
                                                                                                                                                                                                                             "float64_array - _BYTES_PER_ELEMENT",
                                                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                        _0: 8,
-                                                                                                                                                                                                                                        _1: Float64Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                                  _0: 8,
+                                                                                                                                                                                                                                  _1: Float64Array.BYTES_PER_ELEMENT
+                                                                                                                                                                                                                                };
                                                                                                                                                                                                                               })
                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                           tl: {
@@ -1759,14 +1759,14 @@ var suites_1 = {
                                                                                                                                                                                                                               "float64_array - make",
                                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                          _1: new Float64Array([
-                                                                                                                                                                                                                                                1,
-                                                                                                                                                                                                                                                2,
-                                                                                                                                                                                                                                                3
-                                                                                                                                                                                                                                              ]).byteLength
-                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                                                    _0: 24,
+                                                                                                                                                                                                                                    _1: new Float64Array([
+                                                                                                                                                                                                                                          1,
+                                                                                                                                                                                                                                          2,
+                                                                                                                                                                                                                                          3
+                                                                                                                                                                                                                                        ]).byteLength
+                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                             tl: {
@@ -1774,10 +1774,10 @@ var suites_1 = {
                                                                                                                                                                                                                                 "float64_array - fromBuffer",
                                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                            _0: 32,
-                                                                                                                                                                                                                                            _1: new Float64Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                                                      _0: 32,
+                                                                                                                                                                                                                                      _1: new Float64Array(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                               tl: {
@@ -1786,10 +1786,10 @@ var suites_1 = {
                                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                                       var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                              _0: 24,
-                                                                                                                                                                                                                                              _1: new Float64Array(buffer, 8).byteLength
-                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                                                        _0: 24,
+                                                                                                                                                                                                                                        _1: new Float64Array(buffer, 8).byteLength
+                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                 tl: {
@@ -1798,10 +1798,10 @@ var suites_1 = {
                                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                                         var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                _0: 16,
-                                                                                                                                                                                                                                                _1: new Float64Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                                                          _0: 16,
+                                                                                                                                                                                                                                          _1: new Float64Array(buffer, 8, 2).byteLength
+                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                   tl: {
@@ -1809,10 +1809,10 @@ var suites_1 = {
                                                                                                                                                                                                                                       "float64_array - fromLength",
                                                                                                                                                                                                                                       (function (param) {
                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                                                  _1: new Float64Array(3).byteLength
-                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                                                            _0: 24,
+                                                                                                                                                                                                                                            _1: new Float64Array(3).byteLength
+                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                     tl: {
@@ -1828,10 +1828,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                 ]);
                                                                                                                                                                                                                                             a[3] = 14;
                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                    _0: 14,
-                                                                                                                                                                                                                                                    _1: a[3]
-                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                                                              _0: 14,
+                                                                                                                                                                                                                                              _1: a[3]
+                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                       tl: {
@@ -1839,10 +1839,10 @@ var suites_1 = {
                                                                                                                                                                                                                                           "DataView - make, byteLength",
                                                                                                                                                                                                                                           (function (param) {
                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                      _0: 32,
-                                                                                                                                                                                                                                                      _1: new DataView(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                                                _0: 32,
+                                                                                                                                                                                                                                                _1: new DataView(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                         tl: {
@@ -1850,10 +1850,10 @@ var suites_1 = {
                                                                                                                                                                                                                                             "DataView - fromBuffer",
                                                                                                                                                                                                                                             (function (param) {
                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                        _0: 32,
-                                                                                                                                                                                                                                                        _1: new DataView(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                                                  _0: 32,
+                                                                                                                                                                                                                                                  _1: new DataView(new ArrayBuffer(32)).byteLength
+                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                           tl: {
@@ -1862,10 +1862,10 @@ var suites_1 = {
                                                                                                                                                                                                                                               (function (param) {
                                                                                                                                                                                                                                                   var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                                          _1: new DataView(buffer, 8).byteLength
-                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                                                                    _0: 24,
+                                                                                                                                                                                                                                                    _1: new DataView(buffer, 8).byteLength
+                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                             tl: {
@@ -1874,10 +1874,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                 (function (param) {
                                                                                                                                                                                                                                                     var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                                                                            _1: new DataView(buffer, 8, 4).byteLength
-                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                                                                      _0: 4,
+                                                                                                                                                                                                                                                      _1: new DataView(buffer, 8, 4).byteLength
+                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                               tl: {
@@ -1886,10 +1886,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                   (function (param) {
                                                                                                                                                                                                                                                       var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                              _0: buffer,
-                                                                                                                                                                                                                                                              _1: new DataView(buffer).buffer
-                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                                                                        _0: buffer,
+                                                                                                                                                                                                                                                        _1: new DataView(buffer).buffer
+                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                 tl: {
@@ -1898,10 +1898,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                     (function (param) {
                                                                                                                                                                                                                                                         var buffer = new ArrayBuffer(32);
                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                _0: 8,
-                                                                                                                                                                                                                                                                _1: new DataView(buffer, 8).byteOffset
-                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                                                                          _0: 8,
+                                                                                                                                                                                                                                                          _1: new DataView(buffer, 8).byteOffset
+                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                   tl: {
@@ -1912,10 +1912,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                           var view = new DataView(buffer);
                                                                                                                                                                                                                                                           view.setInt8(0, 1);
                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                  _0: 1,
-                                                                                                                                                                                                                                                                  _1: view.getInt8(0)
-                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                                                                            _0: 1,
+                                                                                                                                                                                                                                                            _1: view.getInt8(0)
+                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                     tl: {
@@ -1926,10 +1926,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                             var view = new DataView(buffer);
                                                                                                                                                                                                                                                             view.setUint8(0, 128);
                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                    _0: 128,
-                                                                                                                                                                                                                                                                    _1: view.getUint8(0)
-                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                                                                              _0: 128,
+                                                                                                                                                                                                                                                              _1: view.getUint8(0)
+                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                       tl: {
@@ -1940,10 +1940,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                               var view = new DataView(buffer);
                                                                                                                                                                                                                                                               view.setInt16(0, 257);
                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                      _0: 257,
-                                                                                                                                                                                                                                                                      _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                                                                _0: 257,
+                                                                                                                                                                                                                                                                _1: view.getInt16(0)
+                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                         tl: {
@@ -1954,10 +1954,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                 var view = new DataView(buffer);
                                                                                                                                                                                                                                                                 view.setInt16(0, 25000, 1);
                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                        _0: 25000,
-                                                                                                                                                                                                                                                                        _1: view.getInt16(0, 1)
-                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                                                                  _0: 25000,
+                                                                                                                                                                                                                                                                  _1: view.getInt16(0, 1)
+                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                           tl: {
@@ -1968,10 +1968,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                   var view = new DataView(buffer);
                                                                                                                                                                                                                                                                   view.setInt16(0, 25000, 1);
                                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                                          _0: -22431,
-                                                                                                                                                                                                                                                                          _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                                                                                    _0: -22431,
+                                                                                                                                                                                                                                                                    _1: view.getInt16(0)
+                                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                                             tl: {
@@ -1982,10 +1982,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                     var view = new DataView(buffer);
                                                                                                                                                                                                                                                                     view.setUint16(0, 32768);
                                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                                            _0: 32768,
-                                                                                                                                                                                                                                                                            _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                                                                                      _0: 32768,
+                                                                                                                                                                                                                                                                      _1: view.getUint16(0)
+                                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                                               tl: {
@@ -1996,10 +1996,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                       var view = new DataView(buffer);
                                                                                                                                                                                                                                                                       view.setUint16(0, 32768, 1);
                                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                                              _0: 32768,
-                                                                                                                                                                                                                                                                              _1: view.getUint16(0, 1)
-                                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                                                                                        _0: 32768,
+                                                                                                                                                                                                                                                                        _1: view.getUint16(0, 1)
+                                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                                 tl: {
@@ -2010,10 +2010,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                         var view = new DataView(buffer);
                                                                                                                                                                                                                                                                         view.setUint16(0, 32768, 1);
                                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                                _0: 128,
-                                                                                                                                                                                                                                                                                _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                                                                                          _0: 128,
+                                                                                                                                                                                                                                                                          _1: view.getUint16(0)
+                                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                                   tl: {
@@ -2024,10 +2024,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                           var view = new DataView(buffer);
                                                                                                                                                                                                                                                                           view.setInt32(0, 65537);
                                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                                  _0: 65537,
-                                                                                                                                                                                                                                                                                  _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                                                                                            _0: 65537,
+                                                                                                                                                                                                                                                                            _1: view.getInt32(0)
+                                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                                     tl: {
@@ -2038,10 +2038,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                             var view = new DataView(buffer);
                                                                                                                                                                                                                                                                             view.setInt32(0, 65537, 1);
                                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                                    _0: 65537,
-                                                                                                                                                                                                                                                                                    _1: view.getInt32(0, 1)
-                                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                                                                                              _0: 65537,
+                                                                                                                                                                                                                                                                              _1: view.getInt32(0, 1)
+                                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                                       tl: {
@@ -2052,10 +2052,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                               var view = new DataView(buffer);
                                                                                                                                                                                                                                                                               view.setInt32(0, 65537, 1);
                                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                                      _0: 16777472,
-                                                                                                                                                                                                                                                                                      _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                                                                                _0: 16777472,
+                                                                                                                                                                                                                                                                                _1: view.getInt32(0)
+                                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                                         tl: {
@@ -2066,10 +2066,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                 var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                 view.setUint32(0, 65537);
                                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                                        _0: 65537,
-                                                                                                                                                                                                                                                                                        _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                                                                                  _0: 65537,
+                                                                                                                                                                                                                                                                                  _1: view.getUint32(0)
+                                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                                           tl: {
@@ -2080,10 +2080,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                   var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                   view.setUint32(0, 65537, 1);
                                                                                                                                                                                                                                                                                   return {
-                                                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                                                          _0: 65537,
-                                                                                                                                                                                                                                                                                          _1: view.getUint32(0, 1)
-                                                                                                                                                                                                                                                                                        };
+                                                                                                                                                                                                                                                                                    TAG: "Eq",
+                                                                                                                                                                                                                                                                                    _0: 65537,
+                                                                                                                                                                                                                                                                                    _1: view.getUint32(0, 1)
+                                                                                                                                                                                                                                                                                  };
                                                                                                                                                                                                                                                                                 })
                                                                                                                                                                                                                                                                             ],
                                                                                                                                                                                                                                                                             tl: {
@@ -2094,10 +2094,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                     var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                     view.setUint32(0, 65537, 1);
                                                                                                                                                                                                                                                                                     return {
-                                                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                                                            _0: 16777472,
-                                                                                                                                                                                                                                                                                            _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                          };
+                                                                                                                                                                                                                                                                                      TAG: "Eq",
+                                                                                                                                                                                                                                                                                      _0: 16777472,
+                                                                                                                                                                                                                                                                                      _1: view.getUint32(0)
+                                                                                                                                                                                                                                                                                    };
                                                                                                                                                                                                                                                                                   })
                                                                                                                                                                                                                                                                               ],
                                                                                                                                                                                                                                                                               tl: {
@@ -2108,10 +2108,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                       var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                       view.setFloat32(0, 65537.0);
                                                                                                                                                                                                                                                                                       return {
-                                                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                                                              _0: 65537.0,
-                                                                                                                                                                                                                                                                                              _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                            };
+                                                                                                                                                                                                                                                                                        TAG: "Eq",
+                                                                                                                                                                                                                                                                                        _0: 65537.0,
+                                                                                                                                                                                                                                                                                        _1: view.getFloat32(0)
+                                                                                                                                                                                                                                                                                      };
                                                                                                                                                                                                                                                                                     })
                                                                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                                                                                 tl: {
@@ -2122,10 +2122,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                         var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                         view.setFloat32(0, 65537.0, 1);
                                                                                                                                                                                                                                                                                         return {
-                                                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                                                _0: 65537.0,
-                                                                                                                                                                                                                                                                                                _1: view.getFloat32(0, 1)
-                                                                                                                                                                                                                                                                                              };
+                                                                                                                                                                                                                                                                                          TAG: "Eq",
+                                                                                                                                                                                                                                                                                          _0: 65537.0,
+                                                                                                                                                                                                                                                                                          _1: view.getFloat32(0, 1)
+                                                                                                                                                                                                                                                                                        };
                                                                                                                                                                                                                                                                                       })
                                                                                                                                                                                                                                                                                   ],
                                                                                                                                                                                                                                                                                   tl: {
@@ -2136,10 +2136,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                           var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                           view.setFloat32(0, 1.0, 1);
                                                                                                                                                                                                                                                                                           return {
-                                                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                                                  _0: 4.600602988224807e-41,
-                                                                                                                                                                                                                                                                                                  _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                                };
+                                                                                                                                                                                                                                                                                            TAG: "Eq",
+                                                                                                                                                                                                                                                                                            _0: 4.600602988224807e-41,
+                                                                                                                                                                                                                                                                                            _1: view.getFloat32(0)
+                                                                                                                                                                                                                                                                                          };
                                                                                                                                                                                                                                                                                         })
                                                                                                                                                                                                                                                                                     ],
                                                                                                                                                                                                                                                                                     tl: {
@@ -2150,10 +2150,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                             var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                             view.setFloat64(0, 1e200);
                                                                                                                                                                                                                                                                                             return {
-                                                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                                                    _0: 1e200,
-                                                                                                                                                                                                                                                                                                    _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                  };
+                                                                                                                                                                                                                                                                                              TAG: "Eq",
+                                                                                                                                                                                                                                                                                              _0: 1e200,
+                                                                                                                                                                                                                                                                                              _1: view.getFloat64(0)
+                                                                                                                                                                                                                                                                                            };
                                                                                                                                                                                                                                                                                           })
                                                                                                                                                                                                                                                                                       ],
                                                                                                                                                                                                                                                                                       tl: {
@@ -2164,10 +2164,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                               var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                               view.setFloat64(0, 1e200, 1);
                                                                                                                                                                                                                                                                                               return {
-                                                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                                                      _0: 1e200,
-                                                                                                                                                                                                                                                                                                      _1: view.getFloat64(0, 1)
-                                                                                                                                                                                                                                                                                                    };
+                                                                                                                                                                                                                                                                                                TAG: "Eq",
+                                                                                                                                                                                                                                                                                                _0: 1e200,
+                                                                                                                                                                                                                                                                                                _1: view.getFloat64(0, 1)
+                                                                                                                                                                                                                                                                                              };
                                                                                                                                                                                                                                                                                             })
                                                                                                                                                                                                                                                                                         ],
                                                                                                                                                                                                                                                                                         tl: {
@@ -2178,10 +2178,10 @@ var suites_1 = {
                                                                                                                                                                                                                                                                                                 var view = new DataView(buffer);
                                                                                                                                                                                                                                                                                                 view.setFloat64(0, 1.0, 1);
                                                                                                                                                                                                                                                                                                 return {
-                                                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                                                        _0: 3.03865e-319,
-                                                                                                                                                                                                                                                                                                        _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                      };
+                                                                                                                                                                                                                                                                                                  TAG: "Eq",
+                                                                                                                                                                                                                                                                                                  _0: 3.03865e-319,
+                                                                                                                                                                                                                                                                                                  _1: view.getFloat64(0)
+                                                                                                                                                                                                                                                                                                };
                                                                                                                                                                                                                                                                                               })
                                                                                                                                                                                                                                                                                           ],
                                                                                                                                                                                                                                                                                           tl: /* [] */0
diff --git a/jscomp/test/js_undefined_test.js b/jscomp/test/js_undefined_test.js
index 5e86518ff55..19e721628fa 100644
--- a/jscomp/test/js_undefined_test.js
+++ b/jscomp/test/js_undefined_test.js
@@ -9,10 +9,10 @@ var suites_0 = [
   "toOption - empty",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
+        TAG: "Eq",
+        _0: undefined,
+        _1: undefined
+      };
     })
 ];
 
@@ -21,10 +21,10 @@ var suites_1 = {
     "File \"js_undefined_test.res\", line 7, characters 5-12",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: undefined,
-                _1: undefined
-              };
+          TAG: "Eq",
+          _0: undefined,
+          _1: undefined
+        };
       })
   ],
   tl: {
@@ -32,10 +32,10 @@ var suites_1 = {
       "return",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: "something",
-                  _1: Caml_option.undefined_to_opt("something")
-                };
+            TAG: "Eq",
+            _0: "something",
+            _1: Caml_option.undefined_to_opt("something")
+          };
         })
     ],
     tl: {
@@ -43,10 +43,10 @@ var suites_1 = {
         "test - empty",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: true
+            };
           })
       ],
       tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
           "File \"js_undefined_test.res\", line 10, characters 5-12",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: true
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: true
+              };
             })
         ],
         tl: {
@@ -65,12 +65,12 @@ var suites_1 = {
             "bind - empty",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: undefined,
-                        _1: Js_undefined.bind(undefined, (function (v) {
-                                return v;
-                              }))
-                      };
+                  TAG: "Eq",
+                  _0: undefined,
+                  _1: Js_undefined.bind(undefined, (function (v) {
+                          return v;
+                        }))
+                };
               })
           ],
           tl: {
@@ -78,12 +78,12 @@ var suites_1 = {
               "bind - 'a",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: 4,
-                          _1: Js_undefined.bind(2, (function (n) {
-                                  return (n << 1);
-                                }))
-                        };
+                    TAG: "Eq",
+                    _0: 4,
+                    _1: Js_undefined.bind(2, (function (n) {
+                            return (n << 1);
+                          }))
+                  };
                 })
             ],
             tl: {
@@ -97,10 +97,10 @@ var suites_1 = {
                             hit.contents = true;
                           }));
                     return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: hit.contents
-                          };
+                      TAG: "Eq",
+                      _0: false,
+                      _1: hit.contents
+                    };
                   })
               ],
               tl: {
@@ -114,10 +114,10 @@ var suites_1 = {
                               hit.contents = v;
                             }));
                       return {
-                              TAG: "Eq",
-                              _0: 2,
-                              _1: hit.contents
-                            };
+                        TAG: "Eq",
+                        _0: 2,
+                        _1: hit.contents
+                      };
                     })
                 ],
                 tl: {
@@ -125,10 +125,10 @@ var suites_1 = {
                     "fromOption - None",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: undefined,
-                                _1: Js_undefined.fromOption(undefined)
-                              };
+                          TAG: "Eq",
+                          _0: undefined,
+                          _1: Js_undefined.fromOption(undefined)
+                        };
                       })
                   ],
                   tl: {
@@ -136,10 +136,10 @@ var suites_1 = {
                       "fromOption - Some",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: 2,
-                                  _1: Js_undefined.fromOption(2)
-                                };
+                            TAG: "Eq",
+                            _0: 2,
+                            _1: Js_undefined.fromOption(2)
+                          };
                         })
                     ],
                     tl: /* [] */0
diff --git a/jscomp/test/jsoo_400_test.js b/jscomp/test/jsoo_400_test.js
index fa8e5fdc63c..f0071f38ede 100644
--- a/jscomp/test/jsoo_400_test.js
+++ b/jscomp/test/jsoo_400_test.js
@@ -20,11 +20,11 @@ Mt.from_pair_suites("Jsoo_400_test", {
         "File \"jsoo_400_test.res\", line 7, characters 38-45",
         (function (param) {
             return {
-                    TAG: "ThrowAny",
-                    _0: (function (param) {
-                        u();
-                      })
-                  };
+              TAG: "ThrowAny",
+              _0: (function (param) {
+                  u();
+                })
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/key_word_property.js b/jscomp/test/key_word_property.js
index be6b1e24511..e9e6493228d 100644
--- a/jscomp/test/key_word_property.js
+++ b/jscomp/test/key_word_property.js
@@ -19,26 +19,26 @@ var $$window = Vscode.window;
 
 function mk($$window, $$default) {
   return {
-          window: $$window,
-          default: $$default
-        };
+    window: $$window,
+    default: $$default
+  };
 }
 
 function mk2($$window, $$default) {
   return {
-          hd: {
-            window: $$window,
-            default: $$default
-          },
-          tl: /* [] */0
-        };
+    hd: {
+      window: $$window,
+      default: $$default
+    },
+    tl: /* [] */0
+  };
 }
 
 function des(v) {
   return {
-          window: v.window,
-          default: v.default
-        };
+    window: v.window,
+    default: v.default
+  };
 }
 
 var test = {
diff --git a/jscomp/test/key_word_property2.js b/jscomp/test/key_word_property2.js
index 39da11a3314..b2b1596e613 100644
--- a/jscomp/test/key_word_property2.js
+++ b/jscomp/test/key_word_property2.js
@@ -5,16 +5,16 @@ var Export_keyword = require("./export_keyword.js");
 
 function test2(v) {
   return {
-          _open: v._open,
-          window: v.window
-        };
+    _open: v._open,
+    window: v.window
+  };
 }
 
 function test(p) {
   return [
-          p.catch,
-          p._then
-        ];
+    p.catch,
+    p._then
+  ];
 }
 
 var $$case = Export_keyword.$$case;
diff --git a/jscomp/test/key_word_property_plus_test.js b/jscomp/test/key_word_property_plus_test.js
index a4de6933cd4..cb7b79c1618 100644
--- a/jscomp/test/key_word_property_plus_test.js
+++ b/jscomp/test/key_word_property_plus_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/large_record_duplication_test.js b/jscomp/test/large_record_duplication_test.js
index a95eb3cb73c..56c7ff09e46 100644
--- a/jscomp/test/large_record_duplication_test.js
+++ b/jscomp/test/large_record_duplication_test.js
@@ -28,14 +28,14 @@ var Small = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test
 function f_small(x) {
   if (x.RE_EXN_ID === Small) {
     return {
-            RE_EXN_ID: Small,
-            x: 2,
-            y: x.y
-          };
+      RE_EXN_ID: Small,
+      x: 2,
+      y: x.y
+    };
   } else {
     return {
-            RE_EXN_ID: "Not_found"
-          };
+      RE_EXN_ID: "Not_found"
+    };
   }
 }
 
diff --git a/jscomp/test/lazy_test.js b/jscomp/test/lazy_test.js
index 59956c44201..5e1e4103d8a 100644
--- a/jscomp/test/lazy_test.js
+++ b/jscomp/test/lazy_test.js
@@ -18,9 +18,9 @@ function lazy_test(param) {
   CamlinternalLazy.force(v);
   var g = u.contents;
   return [
-          h,
-          g
-        ];
+    h,
+    g
+  ];
 }
 
 var u_v = {
@@ -57,17 +57,17 @@ var f006 = CamlinternalLazy.from_fun(function () {
 
 var f007 = CamlinternalLazy.from_fun(function () {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     });
 
 var f008 = CamlinternalLazy.from_fun(function () {
       console.log("hi");
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     });
 
 var a2 = CamlinternalLazy.from_val;
@@ -89,13 +89,13 @@ Mt.from_pair_suites("Lazy_test", {
         "simple",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: lazy_test(),
-                    _1: [
-                      3,
-                      32
-                    ]
-                  };
+              TAG: "Eq",
+              _0: lazy_test(),
+              _1: [
+                3,
+                32
+              ]
+            };
           })
       ],
       tl: {
@@ -103,10 +103,10 @@ Mt.from_pair_suites("Lazy_test", {
           "lazy_force",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: u_v.contents,
-                      _1: 2
-                    };
+                TAG: "Eq",
+                _0: u_v.contents,
+                _1: 2
+              };
             })
         ],
         tl: {
@@ -114,10 +114,10 @@ Mt.from_pair_suites("Lazy_test", {
             "lazy_from_fun",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: CamlinternalLazy.force(l_from_fun),
-                        _1: 3
-                      };
+                  TAG: "Eq",
+                  _0: CamlinternalLazy.force(l_from_fun),
+                  _1: 3
+                };
               })
           ],
           tl: {
@@ -125,10 +125,10 @@ Mt.from_pair_suites("Lazy_test", {
               "lazy_from_val",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: CamlinternalLazy.force(CamlinternalLazy.from_val(3)),
-                          _1: 3
-                        };
+                    TAG: "Eq",
+                    _0: CamlinternalLazy.force(CamlinternalLazy.from_val(3)),
+                    _1: 3
+                  };
                 })
             ],
             tl: {
@@ -136,12 +136,12 @@ Mt.from_pair_suites("Lazy_test", {
                 "lazy_from_val2",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: CamlinternalLazy.force(CamlinternalLazy.force(CamlinternalLazy.from_val(CamlinternalLazy.from_fun(function () {
-                                              return 3;
-                                            })))),
-                            _1: 3
-                          };
+                      TAG: "Eq",
+                      _0: CamlinternalLazy.force(CamlinternalLazy.force(CamlinternalLazy.from_val(CamlinternalLazy.from_fun(function () {
+                                        return 3;
+                                      })))),
+                      _1: 3
+                    };
                   })
               ],
               tl: {
@@ -150,10 +150,10 @@ Mt.from_pair_suites("Lazy_test", {
                   (function (param) {
                       debugger;
                       return {
-                              TAG: "Eq",
-                              _0: CamlinternalLazy.force(CamlinternalLazy.force(CamlinternalLazy.from_val(forward_test))),
-                              _1: 4
-                            };
+                        TAG: "Eq",
+                        _0: CamlinternalLazy.force(CamlinternalLazy.force(CamlinternalLazy.from_val(forward_test))),
+                        _1: 4
+                      };
                     })
                 ],
                 tl: {
@@ -161,10 +161,10 @@ Mt.from_pair_suites("Lazy_test", {
                     "lazy_test.res",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: a3,
-                                _1: a4
-                              };
+                          TAG: "Eq",
+                          _0: a3,
+                          _1: a4
+                        };
                       })
                   ],
                   tl: {
@@ -172,10 +172,10 @@ Mt.from_pair_suites("Lazy_test", {
                       "lazy_test.res",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: a7,
-                                  _1: undefined
-                                };
+                            TAG: "Eq",
+                            _0: a7,
+                            _1: undefined
+                          };
                         })
                     ],
                     tl: {
@@ -183,10 +183,10 @@ Mt.from_pair_suites("Lazy_test", {
                         "lazy_test.res",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: a8,
-                                    _1: undefined
-                                  };
+                              TAG: "Eq",
+                              _0: a8,
+                              _1: undefined
+                            };
                           })
                       ],
                       tl: {
@@ -194,9 +194,9 @@ Mt.from_pair_suites("Lazy_test", {
                           "File \"lazy_test.res\", line 95, characters 7-14",
                           (function (param) {
                               return {
-                                      TAG: "Ok",
-                                      _0: Lazy.is_val(CamlinternalLazy.from_val(3))
-                                    };
+                                TAG: "Ok",
+                                _0: Lazy.is_val(CamlinternalLazy.from_val(3))
+                              };
                             })
                         ],
                         tl: {
@@ -204,14 +204,14 @@ Mt.from_pair_suites("Lazy_test", {
                             "File \"lazy_test.res\", line 96, characters 7-14",
                             (function (param) {
                                 return {
-                                        TAG: "Ok",
-                                        _0: !Lazy.is_val(CamlinternalLazy.from_fun(function () {
-                                                  throw {
-                                                        RE_EXN_ID: "Not_found",
-                                                        Error: new Error()
-                                                      };
-                                                }))
-                                      };
+                                  TAG: "Ok",
+                                  _0: !Lazy.is_val(CamlinternalLazy.from_fun(function () {
+                                            throw {
+                                              RE_EXN_ID: "Not_found",
+                                              Error: new Error()
+                                            };
+                                          }))
+                                };
                               })
                           ],
                           tl: /* [] */0
diff --git a/jscomp/test/lib_js_test.js b/jscomp/test/lib_js_test.js
index fc58e1e7148..814ac7a6d7b 100644
--- a/jscomp/test/lib_js_test.js
+++ b/jscomp/test/lib_js_test.js
@@ -20,10 +20,10 @@ var suites_0 = [
   "anything_to_string",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: "3",
-              _1: String(3)
-            };
+        TAG: "Eq",
+        _0: "3",
+        _1: String(3)
+      };
     })
 ];
 
diff --git a/jscomp/test/libqueue_test.js b/jscomp/test/libqueue_test.js
index b0521195de5..851eca1f2d4 100644
--- a/jscomp/test/libqueue_test.js
+++ b/jscomp/test/libqueue_test.js
@@ -9,11 +9,11 @@ var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
 function to_list(q) {
   return List.rev(Queue.fold((function (l, x) {
-                    return {
-                            hd: x,
-                            tl: l
-                          };
-                  }), /* [] */0, q));
+              return {
+                hd: x,
+                tl: l
+              };
+            }), /* [] */0, q));
 }
 
 var Q = {
@@ -57,14 +57,14 @@ var q = {
 
 if (!(to_list(q) === /* [] */0 && q.length === 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          30,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      30,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(1, q);
@@ -74,14 +74,14 @@ if (!(Caml_obj.equal(to_list(q), {
           tl: /* [] */0
         }) && q.length === 1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          32,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      32,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(2, q);
@@ -94,14 +94,14 @@ if (!(Caml_obj.equal(to_list(q), {
           }
         }) && q.length === 2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          34,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      34,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(3, q);
@@ -117,14 +117,14 @@ if (!(Caml_obj.equal(to_list(q), {
           }
         }) && q.length === 3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          36,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      36,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(4, q);
@@ -143,26 +143,26 @@ if (!(Caml_obj.equal(to_list(q), {
           }
         }) && q.length === 4)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      38,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          39,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      39,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(to_list(q), {
@@ -176,26 +176,26 @@ if (!(Caml_obj.equal(to_list(q), {
           }
         }) && q.length === 3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          40,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      40,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          41,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      41,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(to_list(q), {
@@ -206,26 +206,26 @@ if (!(Caml_obj.equal(to_list(q), {
           }
         }) && q.length === 2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          42,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      42,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      43,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(Caml_obj.equal(to_list(q), {
@@ -233,50 +233,50 @@ if (!(Caml_obj.equal(to_list(q), {
           tl: /* [] */0
         }) && q.length === 1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      44,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q) !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      45,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!(to_list(q) === /* [] */0 && q.length === 0)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      46,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.take, q)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          47,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      47,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$1 = {
@@ -289,64 +289,64 @@ Queue.add(1, q$1);
 
 if (Queue.take(q$1) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          53,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      53,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.take, q$1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          54,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      54,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(2, q$1);
 
 if (Queue.take(q$1) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          56,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      56,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.take, q$1)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      57,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      58,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$2 = {
@@ -359,138 +359,138 @@ Queue.add(1, q$2);
 
 if (Queue.peek(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          64,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      64,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(2, q$2);
 
 if (Queue.peek(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          66,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      66,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(3, q$2);
 
 if (Queue.peek(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          68,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      68,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.peek(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          69,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      69,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q$2) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          70,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      70,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.peek(q$2) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          71,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      71,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q$2) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          72,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      72,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.peek(q$2) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          73,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      73,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (Queue.take(q$2) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          74,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      74,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.peek, q$2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      75,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.peek, q$2)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          76,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      76,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$3 = {
@@ -507,26 +507,26 @@ Queue.clear(q$3);
 
 if (q$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          85,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      85,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!does_raise(Queue.take, q$3)) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      86,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(q$3, {
@@ -535,28 +535,28 @@ if (!Caml_obj.equal(q$3, {
         last: "Nil"
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          87,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      87,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.add(42, q$3);
 
 if (Queue.take(q$3) !== 42) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          89,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      89,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1 = {
@@ -603,14 +603,14 @@ if (!Caml_obj.equal(to_list(q1), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          98,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      98,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2), {
@@ -645,51 +645,51 @@ if (!Caml_obj.equal(to_list(q2), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          99,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      99,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q1.length !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          100,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      100,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2.length !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          101,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      101,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 for(var i$2 = 1; i$2 <= 10; ++i$2){
   if (Queue.take(q1) !== i$2) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            103,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        103,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -697,14 +697,14 @@ for(var i$2 = 1; i$2 <= 10; ++i$2){
 for(var i$3 = 1; i$3 <= 10; ++i$3){
   if (Queue.take(q2) !== i$3) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            106,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        106,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -717,39 +717,39 @@ var q$4 = {
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          112,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      112,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 for(var i$4 = 1; i$4 <= 10; ++i$4){
   Queue.add(i$4, q$4);
   if (q$4.length !== i$4) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            115,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        115,
+        4
+      ],
+      Error: new Error()
+    };
   }
   if (q$4.length === 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            116,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        116,
+        4
+      ],
+      Error: new Error()
+    };
   }
   
 }
@@ -757,51 +757,51 @@ for(var i$4 = 1; i$4 <= 10; ++i$4){
 for(var i$5 = 10; i$5 >= 1; --i$5){
   if (q$4.length !== i$5) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            119,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        119,
+        4
+      ],
+      Error: new Error()
+    };
   }
   if (q$4.length === 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            120,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "libqueue_test.res",
+        120,
+        4
+      ],
+      Error: new Error()
+    };
   }
   Queue.take(q$4);
 }
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          123,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      123,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          124,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      124,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q$5 = {
@@ -821,14 +821,14 @@ var i$7 = {
 Queue.iter((function (j) {
         if (i$7.contents !== j) {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "libqueue_test.res",
-                  134,
-                  4
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "libqueue_test.res",
+              134,
+              4
+            ],
+            Error: new Error()
+          };
         }
         i$7.contents = i$7.contents + 1 | 0;
       }), q$5);
@@ -847,100 +847,100 @@ var q2$1 = {
 
 if (q1$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          141,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      141,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$1) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          142,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      142,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      143,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q2$1) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      144,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.transfer(q1$1, q2$1);
 
 if (q1$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      146,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$1) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          147,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      147,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$1.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      148,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q2$1) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      149,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$2 = {
@@ -961,14 +961,14 @@ for(var i$8 = 1; i$8 <= 4; ++i$8){
 
 if (q1$2.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          157,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      157,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q1$2), {
@@ -985,76 +985,76 @@ if (!Caml_obj.equal(to_list(q1$2), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          158,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      158,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$2.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      159,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q2$2) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      160,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.transfer(q1$2, q2$2);
 
 if (q1$2.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      162,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$2) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          163,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      163,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$2.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      164,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2$2), {
@@ -1071,14 +1071,14 @@ if (!Caml_obj.equal(to_list(q2$2), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      165,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$3 = {
@@ -1099,38 +1099,38 @@ for(var i$9 = 5; i$9 <= 8; ++i$9){
 
 if (q1$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          173,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      173,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$3) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          174,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      174,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$3.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          175,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      175,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2$3), {
@@ -1147,52 +1147,52 @@ if (!Caml_obj.equal(to_list(q2$3), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          176,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      176,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.transfer(q1$3, q2$3);
 
 if (q1$3.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      178,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$3) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          179,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      179,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$3.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          180,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      180,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2$3), {
@@ -1209,14 +1209,14 @@ if (!Caml_obj.equal(to_list(q2$3), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          181,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      181,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var q1$4 = {
@@ -1241,14 +1241,14 @@ for(var i$11 = 5; i$11 <= 8; ++i$11){
 
 if (q1$4.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          192,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      192,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q1$4), {
@@ -1265,26 +1265,26 @@ if (!Caml_obj.equal(to_list(q1$4), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          193,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      193,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$4.length !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          194,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      194,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2$4), {
@@ -1301,52 +1301,52 @@ if (!Caml_obj.equal(to_list(q2$4), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          195,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      195,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 Queue.transfer(q1$4, q2$4);
 
 if (q1$4.length !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          197,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      197,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (to_list(q1$4) !== /* [] */0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          198,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      198,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (q2$4.length !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          199,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      199,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(to_list(q2$4), {
@@ -1375,14 +1375,14 @@ if (!Caml_obj.equal(to_list(q2$4), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          200,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "libqueue_test.res",
+      200,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.log("OK");
diff --git a/jscomp/test/limits_test.js b/jscomp/test/limits_test.js
index 03028f40aad..d99bc288073 100644
--- a/jscomp/test/limits_test.js
+++ b/jscomp/test/limits_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/list_test.js b/jscomp/test/list_test.js
index eda351f3773..e9746f319ee 100644
--- a/jscomp/test/list_test.js
+++ b/jscomp/test/list_test.js
@@ -10,19 +10,19 @@ var list_suites_0 = [
   "length",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 1,
-              _1: List.length({
-                    hd: [
-                      0,
-                      1,
-                      2,
-                      3,
-                      4
-                    ],
-                    tl: /* [] */0
-                  })
-            };
+        TAG: "Eq",
+        _0: 1,
+        _1: List.length({
+              hd: [
+                0,
+                1,
+                2,
+                3,
+                4
+              ],
+              tl: /* [] */0
+            })
+      };
     })
 ];
 
@@ -31,25 +31,25 @@ var list_suites_1 = {
     "length2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 5,
-                _1: List.length({
-                      hd: 0,
+          TAG: "Eq",
+          _0: 5,
+          _1: List.length({
+                hd: 0,
+                tl: {
+                  hd: 1,
+                  tl: {
+                    hd: 2,
+                    tl: {
+                      hd: 3,
                       tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 2,
-                          tl: {
-                            hd: 3,
-                            tl: {
-                              hd: 4,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
+                        hd: 4,
+                        tl: /* [] */0
                       }
-                    })
-              };
+                    }
+                  }
+                }
+              })
+        };
       })
   ],
   tl: {
@@ -57,12 +57,12 @@ var list_suites_1 = {
       "long_length",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: 30000,
-                  _1: List.length($$Array.to_list($$Array.init(30000, (function (param) {
-                                  return 0;
-                                }))))
-                };
+            TAG: "Eq",
+            _0: 30000,
+            _1: List.length($$Array.to_list($$Array.init(30000, (function (param) {
+                            return 0;
+                          }))))
+          };
         })
     ],
     tl: {
@@ -70,34 +70,34 @@ var list_suites_1 = {
         "sort",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: List.sort(Caml.int_compare, {
-                          hd: 4,
-                          tl: {
-                            hd: 1,
-                            tl: {
-                              hd: 2,
-                              tl: {
-                                hd: 3,
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }),
-                    _1: {
+              TAG: "Eq",
+              _0: List.sort(Caml.int_compare, {
+                    hd: 4,
+                    tl: {
                       hd: 1,
                       tl: {
                         hd: 2,
                         tl: {
                           hd: 3,
-                          tl: {
-                            hd: 4,
-                            tl: /* [] */0
-                          }
+                          tl: /* [] */0
                         }
                       }
                     }
-                  };
+                  }),
+              _1: {
+                hd: 1,
+                tl: {
+                  hd: 2,
+                  tl: {
+                    hd: 3,
+                    tl: {
+                      hd: 4,
+                      tl: /* [] */0
+                    }
+                  }
+                }
+              }
+            };
           })
       ],
       tl: {
@@ -105,19 +105,19 @@ var list_suites_1 = {
           "File \"list_test.res\", line 20, characters 5-12",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: List.mem(3, {
-                            hd: 1,
-                            tl: {
-                              hd: 2,
-                              tl: {
-                                hd: 3,
-                                tl: /* [] */0
-                              }
-                            }
-                          })
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: List.mem(3, {
+                      hd: 1,
+                      tl: {
+                        hd: 2,
+                        tl: {
+                          hd: 3,
+                          tl: /* [] */0
+                        }
+                      }
+                    })
+              };
             })
         ],
         tl: {
@@ -125,19 +125,19 @@ var list_suites_1 = {
             "File \"list_test.res\", line 21, characters 5-12",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: List.mem(4, {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            })
-                      };
+                  TAG: "Eq",
+                  _0: false,
+                  _1: List.mem(4, {
+                        hd: 1,
+                        tl: {
+                          hd: 2,
+                          tl: {
+                            hd: 3,
+                            tl: /* [] */0
+                          }
+                        }
+                      })
+                };
               })
           ],
           tl: {
@@ -145,22 +145,22 @@ var list_suites_1 = {
               "File \"list_test.res\", line 22, characters 5-12",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: 9,
-                          _1: List.assoc(4, {
-                                hd: [
-                                  1,
-                                  2
-                                ],
-                                tl: {
-                                  hd: [
-                                    4,
-                                    9
-                                  ],
-                                  tl: /* [] */0
-                                }
-                              })
-                        };
+                    TAG: "Eq",
+                    _0: 9,
+                    _1: List.assoc(4, {
+                          hd: [
+                            1,
+                            2
+                          ],
+                          tl: {
+                            hd: [
+                              4,
+                              9
+                            ],
+                            tl: /* [] */0
+                          }
+                        })
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/loop_regression_test.js b/jscomp/test/loop_regression_test.js
index 4cee928188f..f0ecf7677f7 100644
--- a/jscomp/test/loop_regression_test.js
+++ b/jscomp/test/loop_regression_test.js
@@ -25,10 +25,10 @@ var suites_0 = [
   "sum",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 55,
-              _1: f()
-            };
+        TAG: "Eq",
+        _0: 55,
+        _1: f()
+      };
     })
 ];
 
diff --git a/jscomp/test/map_find_test.js b/jscomp/test/map_find_test.js
index 3c7f673180c..ddf57b85aa2 100644
--- a/jscomp/test/map_find_test.js
+++ b/jscomp/test/map_find_test.js
@@ -17,13 +17,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -34,10 +34,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -50,27 +50,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -83,22 +83,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -110,13 +110,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -140,9 +140,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(x, param.v);
     if (c === 0) {
@@ -193,13 +193,13 @@ function create$1(l, x, d, r) {
   var hl = height$1(l);
   var hr = height$1(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -210,10 +210,10 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -226,27 +226,27 @@ function bal$1(l, x, d, r) {
       return create$1(create$1(ll, lv, ld, lr.l), lr.v, lr.d, create$1(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -259,22 +259,22 @@ function bal$1(l, x, d, r) {
     return create$1(create$1(l, x, d, rl.l), rl.v, rl.d, create$1(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add$1(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -286,13 +286,13 @@ function add$1(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -316,9 +316,9 @@ function find$1(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.string_compare(x, param.v);
     if (c === 0) {
@@ -362,10 +362,10 @@ Mt.from_pair_suites("Map_find_test", {
         "int",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
+              TAG: "Eq",
+              _0: find(10, m),
+              _1: /* 'a' */97
+            };
           })
       ],
       tl: {
@@ -373,10 +373,10 @@ Mt.from_pair_suites("Map_find_test", {
           "string",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: find$1("10", s),
-                      _1: /* 'a' */97
-                    };
+                TAG: "Eq",
+                _0: find$1("10", s),
+                _1: /* 'a' */97
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js
index 8b6e6593273..e8f2116f064 100644
--- a/jscomp/test/map_test.js
+++ b/jscomp/test/map_test.js
@@ -18,13 +18,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -35,10 +35,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -51,27 +51,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -84,22 +84,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -111,13 +111,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -233,13 +233,13 @@ function create$1(l, x, d, r) {
   var hl = height$1(l);
   var hr = height$1(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, x, d, r) {
@@ -250,10 +250,10 @@ function bal$1(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -266,27 +266,27 @@ function bal$1(l, x, d, r) {
       return create$1(create$1(ll, lv, ld, lr.l), lr.v, lr.d, create$1(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -299,22 +299,22 @@ function bal$1(l, x, d, r) {
     return create$1(create$1(l, x, d, rl.l), rl.v, rl.d, create$1(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add$1(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -326,13 +326,13 @@ function add$1(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -356,9 +356,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.string_compare(x, param.v);
     if (c === 0) {
@@ -371,8 +371,8 @@ function find(x, _param) {
 
 function of_list(kvs) {
   return List.fold_left((function (acc, param) {
-                return add(param[0], param[1], acc);
-              }), "Empty", kvs);
+          return add(param[0], param[1], acc);
+        }), "Empty", kvs);
 }
 
 var int_map_suites_0 = [
@@ -398,10 +398,10 @@ var int_map_suites_0 = [
             }
           });
       return {
-              TAG: "Eq",
-              _0: cardinal(v),
-              _1: 3
-            };
+        TAG: "Eq",
+        _0: cardinal(v),
+        _1: 3
+      };
     })
 ];
 
@@ -448,10 +448,10 @@ var int_map_suites_1 = {
               }
             });
         return {
-                TAG: "Eq",
-                _0: compare(Caml.int_compare, u, v),
-                _1: 0
-              };
+          TAG: "Eq",
+          _0: compare(Caml.int_compare, u, v),
+          _1: 0
+        };
       })
   ],
   tl: {
@@ -497,12 +497,12 @@ var int_map_suites_1 = {
                 }
               });
           return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: equal((function (x, y) {
-                          return x === y;
-                        }), u, v)
-                };
+            TAG: "Eq",
+            _0: true,
+            _1: equal((function (x, y) {
+                    return x === y;
+                  }), u, v)
+          };
         })
     ],
     tl: {
@@ -521,10 +521,10 @@ var int_map_suites_1 = {
               
             }
             return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: -1
-                  };
+              TAG: "Eq",
+              _0: v,
+              _1: -1
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/mario_game.js b/jscomp/test/mario_game.js
index f73eb9fa404..621a5eb4990 100644
--- a/jscomp/test/mario_game.js
+++ b/jscomp/test/mario_game.js
@@ -30,15 +30,15 @@ function setup_sprite(loopOpt, bbox_offsetOpt, bbox_sizeOpt, img_src, max_frames
       ]) ? frame_size : bbox_size;
   var img_src$1 = "./sprites/" + img_src;
   return {
-          max_frames: max_frames,
-          max_ticks: max_ticks,
-          img_src: img_src$1,
-          frame_size: frame_size,
-          src_offset: src_offset,
-          bbox_offset: bbox_offset,
-          bbox_size: bbox_size$1,
-          loop: loop
-        };
+    max_frames: max_frames,
+    max_ticks: max_ticks,
+    img_src: img_src$1,
+    frame_size: frame_size,
+    src_offset: src_offset,
+    bbox_offset: bbox_offset,
+    bbox_size: bbox_size$1,
+    loop: loop
+  };
 }
 
 function make_enemy(param) {
@@ -46,106 +46,106 @@ function make_enemy(param) {
   switch (param[0]) {
     case "Goomba" :
         return setup_sprite(undefined, [
-                    1,
-                    1
-                  ], [
-                    14,
-                    14
-                  ], "enemies.png", 2, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    128
-                  ]);
+              1,
+              1
+            ], [
+              14,
+              14
+            ], "enemies.png", 2, 10, [
+              16,
+              16
+            ], [
+              0,
+              128
+            ]);
     case "GKoopa" :
         if (dir === "Left") {
           return setup_sprite(undefined, [
-                      4,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      0,
-                      69
-                    ]);
+                4,
+                10
+              ], [
+                11,
+                16
+              ], "enemies.png", 2, 10, [
+                16,
+                27
+              ], [
+                0,
+                69
+              ]);
         } else {
           return setup_sprite(undefined, [
-                      1,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      32,
-                      69
-                    ]);
+                1,
+                10
+              ], [
+                11,
+                16
+              ], "enemies.png", 2, 10, [
+                16,
+                27
+              ], [
+                32,
+                69
+              ]);
         }
     case "RKoopa" :
         if (dir === "Left") {
           return setup_sprite(undefined, [
-                      4,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      0,
-                      5
-                    ]);
+                4,
+                10
+              ], [
+                11,
+                16
+              ], "enemies.png", 2, 10, [
+                16,
+                27
+              ], [
+                0,
+                5
+              ]);
         } else {
           return setup_sprite(undefined, [
-                      1,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      32,
-                      5
-                    ]);
+                1,
+                10
+              ], [
+                11,
+                16
+              ], "enemies.png", 2, 10, [
+                16,
+                27
+              ], [
+                32,
+                5
+              ]);
         }
     case "GKoopaShell" :
         return setup_sprite(undefined, [
-                    2,
-                    2
-                  ], [
-                    12,
-                    13
-                  ], "enemies.png", 4, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    96
-                  ]);
+              2,
+              2
+            ], [
+              12,
+              13
+            ], "enemies.png", 4, 10, [
+              16,
+              16
+            ], [
+              0,
+              96
+            ]);
     case "RKoopaShell" :
         return setup_sprite(undefined, [
-                    2,
-                    2
-                  ], [
-                    12,
-                    13
-                  ], "enemies.png", 4, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    32
-                  ]);
+              2,
+              2
+            ], [
+              12,
+              13
+            ], "enemies.png", 4, 10, [
+              16,
+              16
+            ], [
+              0,
+              32
+            ]);
     
   }
 }
@@ -154,92 +154,92 @@ function make_particle(x) {
   switch (x) {
     case "GoombaSquish" :
         return setup_sprite(undefined, undefined, undefined, "enemies.png", 1, 0, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    144
-                  ]);
+              16,
+              16
+            ], [
+              0,
+              144
+            ]);
     case "BrickChunkL" :
         return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
+              8,
+              8
+            ], [
+              0,
+              0
+            ]);
     case "BrickChunkR" :
         return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    8,
-                    0
-                  ]);
+              8,
+              8
+            ], [
+              8,
+              0
+            ]);
     case "Score100" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
+              12,
+              8
+            ], [
+              0,
+              0
+            ]);
     case "Score200" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    9
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              9
+            ]);
     case "Score400" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    18
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              18
+            ]);
     case "Score800" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    27
-                  ]);
+              12,
+              9
+            ], [
+              0,
+              27
+            ]);
     case "Score1000" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    0
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              0
+            ]);
     case "Score2000" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    9
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              9
+            ]);
     case "Score4000" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    18
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              18
+            ]);
     case "Score8000" :
         return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    27
-                  ]);
+              14,
+              9
+            ], [
+              13,
+              27
+            ]);
     
   }
 }
@@ -258,120 +258,120 @@ function make_type(typ, dir) {
             switch (typ$1) {
               case "Standing" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              16,
-                              5
-                            ]);
+                        2,
+                        1
+                      ], [
+                        13,
+                        25
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        27
+                      ], [
+                        16,
+                        5
+                      ]);
               case "Jumping" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              48,
-                              6
-                            ]);
+                        2,
+                        1
+                      ], [
+                        12,
+                        25
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        26
+                      ], [
+                        48,
+                        6
+                      ]);
               case "Running" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 4, 10, [
-                              16,
-                              27
-                            ], [
-                              0,
-                              37
-                            ]);
+                        2,
+                        1
+                      ], [
+                        13,
+                        25
+                      ], "mario-big.png", 4, 10, [
+                        16,
+                        27
+                      ], [
+                        0,
+                        37
+                      ]);
               case "Crouching" :
                   return setup_sprite(undefined, [
-                              2,
-                              10
-                            ], [
-                              13,
-                              17
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              32,
-                              5
-                            ]);
+                        2,
+                        10
+                      ], [
+                        13,
+                        17
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        27
+                      ], [
+                        32,
+                        5
+                      ]);
               
             }
           } else {
             switch (typ$1) {
               case "Standing" :
                   return setup_sprite(undefined, [
-                              1,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              16,
-                              69
-                            ]);
+                        1,
+                        1
+                      ], [
+                        13,
+                        25
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        26
+                      ], [
+                        16,
+                        69
+                      ]);
               case "Jumping" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              48,
-                              70
-                            ]);
+                        2,
+                        1
+                      ], [
+                        12,
+                        25
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        26
+                      ], [
+                        48,
+                        70
+                      ]);
               case "Running" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 4, 10, [
-                              16,
-                              27
-                            ], [
-                              0,
-                              101
-                            ]);
+                        2,
+                        1
+                      ], [
+                        13,
+                        25
+                      ], "mario-big.png", 4, 10, [
+                        16,
+                        27
+                      ], [
+                        0,
+                        101
+                      ]);
               case "Crouching" :
                   return setup_sprite(undefined, [
-                              2,
-                              10
-                            ], [
-                              13,
-                              17
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              32,
-                              69
-                            ]);
+                        2,
+                        10
+                      ], [
+                        13,
+                        17
+                      ], "mario-big.png", 1, 0, [
+                        16,
+                        27
+                      ], [
+                        32,
+                        69
+                      ]);
               
             }
           }
@@ -381,238 +381,238 @@ function make_type(typ, dir) {
             switch (typ$2) {
               case "Standing" :
                   return setup_sprite(undefined, [
-                              3,
-                              1
-                            ], [
-                              11,
-                              15
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              0
-                            ]);
+                        3,
+                        1
+                      ], [
+                        11,
+                        15
+                      ], "mario-small.png", 1, 0, [
+                        16,
+                        16
+                      ], [
+                        0,
+                        0
+                      ]);
               case "Jumping" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              15
-                            ], "mario-small.png", 2, 10, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              16
-                            ]);
+                        2,
+                        1
+                      ], [
+                        13,
+                        15
+                      ], "mario-small.png", 2, 10, [
+                        16,
+                        16
+                      ], [
+                        16,
+                        16
+                      ]);
               case "Running" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              15
-                            ], "mario-small.png", 3, 5, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              0
-                            ]);
+                        2,
+                        1
+                      ], [
+                        12,
+                        15
+                      ], "mario-small.png", 3, 5, [
+                        16,
+                        16
+                      ], [
+                        16,
+                        0
+                      ]);
               case "Crouching" :
                   return setup_sprite(undefined, [
-                              1,
-                              5
-                            ], [
-                              14,
-                              10
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              64
-                            ]);
+                        1,
+                        5
+                      ], [
+                        14,
+                        10
+                      ], "mario-small.png", 1, 0, [
+                        16,
+                        16
+                      ], [
+                        0,
+                        64
+                      ]);
               
             }
           } else {
             switch (typ$2) {
               case "Standing" :
                   return setup_sprite(undefined, [
-                              1,
-                              1
-                            ], [
-                              11,
-                              15
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              32
-                            ]);
+                        1,
+                        1
+                      ], [
+                        11,
+                        15
+                      ], "mario-small.png", 1, 0, [
+                        16,
+                        16
+                      ], [
+                        0,
+                        32
+                      ]);
               case "Jumping" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              15
-                            ], "mario-small.png", 2, 10, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              48
-                            ]);
+                        2,
+                        1
+                      ], [
+                        13,
+                        15
+                      ], "mario-small.png", 2, 10, [
+                        16,
+                        16
+                      ], [
+                        16,
+                        48
+                      ]);
               case "Running" :
                   return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              15
-                            ], "mario-small.png", 3, 5, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              32
-                            ]);
+                        2,
+                        1
+                      ], [
+                        12,
+                        15
+                      ], "mario-small.png", 3, 5, [
+                        16,
+                        16
+                      ], [
+                        16,
+                        32
+                      ]);
               case "Crouching" :
                   return setup_sprite(undefined, [
-                              1,
-                              5
-                            ], [
-                              14,
-                              10
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              64
-                            ]);
+                        1,
+                        5
+                      ], [
+                        14,
+                        10
+                      ], "mario-small.png", 1, 0, [
+                        16,
+                        16
+                      ], [
+                        0,
+                        64
+                      ]);
               
             }
           }
         }
     case "SEnemy" :
         return make_enemy([
-                    typ._0,
-                    dir
-                  ]);
+              typ._0,
+              dir
+            ]);
     case "SItem" :
         var x = typ._0;
         switch (x) {
           case "Mushroom" :
               return setup_sprite(undefined, [
-                          2,
-                          0
-                        ], [
-                          12,
-                          16
-                        ], "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          0
-                        ]);
+                    2,
+                    0
+                  ], [
+                    12,
+                    16
+                  ], "items.png", 1, 0, [
+                    16,
+                    16
+                  ], [
+                    0,
+                    0
+                  ]);
           case "FireFlower" :
               return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          188
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    188
+                  ]);
           case "Star" :
               return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          16,
-                          48
-                        ]);
+                    16,
+                    16
+                  ], [
+                    16,
+                    48
+                  ]);
           case "Coin" :
               return setup_sprite(undefined, [
-                          3,
-                          0
-                        ], [
-                          12,
-                          16
-                        ], "items.png", 3, 15, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          80
-                        ]);
+                    3,
+                    0
+                  ], [
+                    12,
+                    16
+                  ], "items.png", 3, 15, [
+                    16,
+                    16
+                  ], [
+                    0,
+                    80
+                  ]);
           
         }
     case "SBlock" :
         var x$1 = typ._0;
         if (typeof x$1 === "object") {
           return setup_sprite(undefined, undefined, undefined, "blocks.png", 4, 15, [
-                      16,
-                      16
-                    ], [
-                      0,
-                      16
-                    ]);
+                16,
+                16
+              ], [
+                0,
+                16
+              ]);
         }
         switch (x$1) {
           case "QBlockUsed" :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    32
+                  ]);
           case "Brick" :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 5, 10, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          0
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    0
+                  ]);
           case "UnBBlock" :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          48
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    48
+                  ]);
           case "Cloud" :
               return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          64
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    64
+                  ]);
           case "Panel" :
               return setup_sprite(undefined, undefined, undefined, "panel.png", 3, 15, [
-                          26,
-                          26
-                        ], [
-                          0,
-                          0
-                        ]);
+                    26,
+                    26
+                  ], [
+                    0,
+                    0
+                  ]);
           case "Ground" :
               return setup_sprite(undefined, undefined, undefined, "ground.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
+                    16,
+                    16
+                  ], [
+                    0,
+                    32
+                  ]);
           
         }
     
@@ -623,16 +623,16 @@ function make_from_params(params, context) {
   var img = document.createElement("img");
   img.src = params.img_src;
   return {
-          params: params,
-          context: context,
-          frame: {
-            contents: 0
-          },
-          ticks: {
-            contents: 0
-          },
-          img: img
-        };
+    params: params,
+    context: context,
+    frame: {
+      contents: 0
+    },
+    ticks: {
+      contents: 0
+    },
+    img: img
+  };
 }
 
 function make(spawn, dir, context) {
@@ -694,9 +694,9 @@ var Sprite = {
 
 function pair_to_xy(pair) {
   return {
-          x: pair[0],
-          y: pair[1]
-        };
+    x: pair[0],
+    y: pair[1]
+  };
 }
 
 function make_type$1(typ, ctx) {
@@ -704,16 +704,16 @@ function make_type$1(typ, ctx) {
     case "BrickChunkL" :
     case "BrickChunkR" :
         return {
-                sprite: make_particle$1(typ, ctx),
-                rot: 0,
-                lifetime: 300
-              };
+          sprite: make_particle$1(typ, ctx),
+          rot: 0,
+          lifetime: 300
+        };
     default:
       return {
-              sprite: make_particle$1(typ, ctx),
-              rot: 0,
-              lifetime: 30
-            };
+        sprite: make_particle$1(typ, ctx),
+        rot: 0,
+        lifetime: 30
+      };
   }
 }
 
@@ -731,14 +731,14 @@ function make$1(velOpt, accOpt, part_type, pos, ctx) {
   var vel$1 = pair_to_xy(vel);
   var acc$1 = pair_to_xy(acc);
   return {
-          params: params,
-          part_type: part_type,
-          pos: pos$1,
-          vel: vel$1,
-          acc: acc$1,
-          kill: false,
-          life: params.lifetime
-        };
+    params: params,
+    part_type: part_type,
+    pos: pos$1,
+    vel: vel$1,
+    acc: acc$1,
+    kill: false,
+    life: params.lifetime
+  };
 }
 
 function make_score(score, pos, ctx) {
@@ -762,9 +762,9 @@ function make_score(score, pos, ctx) {
         )
     );
   return make$1([
-              0.5,
-              -0.7
-            ], undefined, t, pos, ctx);
+        0.5,
+        -0.7
+      ], undefined, t, pos, ctx);
 }
 
 function update_vel(part) {
@@ -796,9 +796,9 @@ function setup_obj(has_gravityOpt, speedOpt, param) {
   var has_gravity = has_gravityOpt !== undefined ? has_gravityOpt : true;
   var speed = speedOpt !== undefined ? speedOpt : 1;
   return {
-          has_gravity: has_gravity,
-          speed: speed
-        };
+    has_gravity: has_gravity,
+    speed: speed
+  };
 }
 
 function set_vel_to_speed(obj) {
@@ -869,9 +869,9 @@ function make$2($staropt$star, $staropt$star$1, spawnable, context, param) {
     score: 0
   };
   return [
-          spr,
-          obj
-        ];
+    spr,
+    obj
+  ];
 }
 
 function spawn(spawnable, context, param) {
@@ -884,33 +884,33 @@ function spawn(spawnable, context, param) {
   switch (spawnable.TAG) {
     case "SPlayer" :
         return {
-                TAG: "Player",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: "Player",
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case "SEnemy" :
         set_vel_to_speed(obj);
         return {
-                TAG: "Enemy",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: "Enemy",
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case "SItem" :
         return {
-                TAG: "Item",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: "Item",
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     case "SBlock" :
         return {
-                TAG: "Block",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
+          TAG: "Block",
+          _0: spawnable._0,
+          _1: spr,
+          _2: obj
+        };
     
   }
 }
@@ -1004,49 +1004,49 @@ function update_player(player, keys, context) {
   var pl_typ = player.health <= 1 ? "SmallM" : "BigM";
   if (!prev_jumping && player.jumping) {
     return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Jumping"
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: "SPlayer",
+            _0: pl_typ,
+            _1: "Jumping"
+          }, player.dir, context)
+    ];
   } else if (prev_dir !== player.dir || prev_vx === 0 && Math.abs(player.vel.x) > 0 && !player.jumping) {
     return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Running"
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: "SPlayer",
+            _0: pl_typ,
+            _1: "Running"
+          }, player.dir, context)
+    ];
   } else if (prev_dir !== player.dir && player.jumping && prev_jumping) {
     return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Jumping"
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: "SPlayer",
+            _0: pl_typ,
+            _1: "Jumping"
+          }, player.dir, context)
+    ];
   } else if (player.vel.y === 0 && player.crouch) {
     return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Crouching"
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: "SPlayer",
+            _0: pl_typ,
+            _1: "Crouching"
+          }, player.dir, context)
+    ];
   } else if (player.vel.y === 0 && player.vel.x === 0) {
     return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Standing"
-                }, player.dir, context)
-          ];
+      pl_typ,
+      make({
+            TAG: "SPlayer",
+            _0: pl_typ,
+            _1: "Standing"
+          }, player.dir, context)
+    ];
   } else {
     return;
   }
@@ -1144,11 +1144,11 @@ function evolve_enemy(player_dir, typ, spr, obj, context) {
         var new_spr = match[0];
         normalize_pos(new_obj.pos, spr.params, new_spr.params);
         return {
-                TAG: "Enemy",
-                _0: "GKoopaShell",
-                _1: new_spr,
-                _2: new_obj
-              };
+          TAG: "Enemy",
+          _0: "GKoopaShell",
+          _1: new_spr,
+          _2: new_obj
+        };
     case "RKoopa" :
         var match$1 = make$2(undefined, obj.dir, {
               TAG: "SEnemy",
@@ -1161,11 +1161,11 @@ function evolve_enemy(player_dir, typ, spr, obj, context) {
         var new_spr$1 = match$1[0];
         normalize_pos(new_obj$1.pos, spr.params, new_spr$1.params);
         return {
-                TAG: "Enemy",
-                _0: "RKoopaShell",
-                _1: new_spr$1,
-                _2: new_obj$1
-              };
+          TAG: "Enemy",
+          _0: "RKoopaShell",
+          _1: new_spr$1,
+          _2: new_obj$1
+        };
     case "GKoopaShell" :
     case "RKoopaShell" :
         break;
@@ -1209,11 +1209,11 @@ function evolve_block(obj, context) {
         obj.pos.y
       ]);
   return {
-          TAG: "Block",
-          _0: "QBlockUsed",
-          _1: match[0],
-          _2: match[1]
-        };
+    TAG: "Block",
+    _0: "QBlockUsed",
+    _1: match[0],
+    _2: match[1]
+  };
 }
 
 function spawn_above(player_dir, obj, typ, context) {
@@ -1241,15 +1241,15 @@ function get_aabb(obj) {
   var sy = match$1[1];
   var sx = match$1[0];
   return {
-          center: {
-            x: box + sx / 2,
-            y: boy + sy / 2
-          },
-          half: {
-            x: sx / 2,
-            y: sy / 2
-          }
-        };
+    center: {
+      x: box + sx / 2,
+      y: boy + sy / 2
+    },
+    half: {
+      x: sx / 2,
+      y: sy / 2
+    }
+  };
 }
 
 function col_bypass(c1, c2) {
@@ -1334,25 +1334,25 @@ function kill(collid, ctx) {
           pos_1
         ];
         var score = o.score > 0 ? ({
-              hd: make_score(o.score, pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
+            hd: make_score(o.score, pos, ctx),
+            tl: /* [] */0
+          }) : /* [] */0;
         var remains;
         remains = collid._0 === "Goomba" ? ({
-              hd: make$1(undefined, undefined, "GoombaSquish", pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
+            hd: make$1(undefined, undefined, "GoombaSquish", pos, ctx),
+            tl: /* [] */0
+          }) : /* [] */0;
         return Pervasives.$at(score, remains);
     case "Item" :
         var o$1 = collid._2;
         if (collid._0 === "Mushroom") {
           return {
-                  hd: make_score(o$1.score, [
-                        o$1.pos.x,
-                        o$1.pos.y
-                      ], ctx),
-                  tl: /* [] */0
-                };
+            hd: make_score(o$1.score, [
+                  o$1.pos.x,
+                  o$1.pos.y
+                ], ctx),
+            tl: /* [] */0
+          };
         } else {
           return /* [] */0;
         }
@@ -1400,18 +1400,18 @@ function kill(collid, ctx) {
               0.2
             ], "BrickChunkR", pos$1, ctx);
         return {
-                hd: p1,
-                tl: {
-                  hd: p2,
-                  tl: {
-                    hd: p3,
-                    tl: {
-                      hd: p4,
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              };
+          hd: p1,
+          tl: {
+            hd: p2,
+            tl: {
+              hd: p3,
+              tl: {
+                hd: p4,
+                tl: /* [] */0
+              }
+            }
+          }
+        };
     
   }
 }
@@ -1456,16 +1456,16 @@ function render(sprite, param) {
   var match$2 = sprite.params.frame_size;
   var sx = match[0] + sprite.frame.contents * sw;
   return Curry.app(context.drawImage, [
-              sprite.img,
-              sx,
-              match[1],
-              sw,
-              match$1[1],
-              param[0],
-              param[1],
-              match$2[0],
-              match$2[1]
-            ]);
+        sprite.img,
+        sx,
+        match[1],
+        sw,
+        match$1[1],
+        param[0],
+        param[1],
+        match$2[0],
+        match$2[1]
+      ]);
 }
 
 function draw_bgd(bgd, off_x) {
@@ -1474,9 +1474,9 @@ function draw_bgd(bgd, off_x) {
         0
       ]);
   return render(bgd, [
-              bgd.params.frame_size[0] - off_x,
-              0
-            ]);
+        bgd.params.frame_size[0] - off_x,
+        0
+      ]);
 }
 
 function clear_canvas(canvas) {
@@ -1509,10 +1509,10 @@ function game_win(ctx) {
   ctx.font = "20px 'Press Start 2P'";
   Curry._3(ctx.fillText, "You win!", 180, 128);
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "Game over.",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "Game over.",
+    Error: new Error()
+  };
 }
 
 function game_loss(ctx) {
@@ -1523,10 +1523,10 @@ function game_loss(ctx) {
   ctx.font = "20px 'Press Start 2P'";
   Curry._3(ctx.fillText, "GAME OVER. You lose!", 60, 128);
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "Game over.",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "Game over.",
+    Error: new Error()
+  };
 }
 
 var Draw = {
@@ -1542,19 +1542,19 @@ var Draw = {
 
 function make$3(param, param$1) {
   return {
-          pos: {
-            x: 0,
-            y: 0
-          },
-          v_dim: {
-            x: param[0],
-            y: param[1]
-          },
-          m_dim: {
-            x: param$1[0],
-            y: param$1[1]
-          }
-        };
+    pos: {
+      x: 0,
+      y: 0
+    },
+    v_dim: {
+      x: param[0],
+      y: param[1]
+    },
+    m_dim: {
+      x: param$1[0],
+      y: param$1[1]
+    }
+  };
 }
 
 function calc_viewport_point(cc, vc, mc) {
@@ -1583,9 +1583,9 @@ function out_of_viewport_below(v, y) {
 
 function coord_to_viewport(viewport, coord) {
   return {
-          x: coord.x - viewport.pos.x,
-          y: coord.y - viewport.pos.y
-        };
+    x: coord.x - viewport.pos.x,
+    y: coord.y - viewport.pos.y
+  };
 }
 
 function update(vpt, ctr) {
@@ -1596,10 +1596,10 @@ function update(vpt, ctr) {
     y: new_y
   };
   return {
-          pos: pos,
-          v_dim: vpt.v_dim,
-          m_dim: vpt.m_dim
-        };
+    pos: pos,
+    v_dim: vpt.v_dim,
+    m_dim: vpt.m_dim
+  };
 }
 
 var Viewport = {
@@ -1663,9 +1663,9 @@ function process_collision(dir, c1, c2, state) {
         switch (c2.TAG) {
           case "Player" :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case "Enemy" :
               var o2$3 = c2._2;
               var s2$2 = c2._1;
@@ -1703,37 +1703,37 @@ function process_collision(dir, c1, c2, state) {
                           collide_block(undefined, dir, o1$3);
                           dec_health(o2$4);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         } else {
                           collide_block(undefined, dir, o1$3);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                     case "Panel" :
                         game_win(state.ctx);
                         return [
-                                undefined,
-                                undefined
-                              ];
+                          undefined,
+                          undefined
+                        ];
                     default:
                       collide_block(undefined, dir, o1$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                   }
                 } else {
                   var updated_block = evolve_block(o2$4, context);
                   var spawned_item = spawn_above(o1$3.dir, o2$4, t._0, context);
                   collide_block(undefined, dir, o1$3);
                   return [
-                          spawned_item,
-                          updated_block
-                        ];
+                    spawned_item,
+                    updated_block
+                  ];
                 }
               } else {
                 var exit$1 = 0;
@@ -1741,9 +1741,9 @@ function process_collision(dir, c1, c2, state) {
                   if (t === "Panel") {
                     game_win(state.ctx);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                   }
                   exit$1 = 4;
                 } else {
@@ -1754,15 +1754,15 @@ function process_collision(dir, c1, c2, state) {
                     state.multiplier = 1;
                     collide_block(undefined, dir, o1$3);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                   }
                   collide_block(undefined, dir, o1$3);
                   return [
-                          undefined,
-                          undefined
-                        ];
+                    undefined,
+                    undefined
+                  ];
                 }
                 
               }
@@ -1832,9 +1832,9 @@ function process_collision(dir, c1, c2, state) {
                         case "North" :
                         case "South" :
                             return [
-                                    undefined,
-                                    undefined
-                                  ];
+                              undefined,
+                              undefined
+                            ];
                         case "East" :
                         case "West" :
                             exit$3 = 4;
@@ -1845,9 +1845,9 @@ function process_collision(dir, c1, c2, state) {
                         rev_dir(o1$4, t1, s1$3);
                         rev_dir(o2$5, t2$2, s2$3);
                         return [
-                                undefined,
-                                undefined
-                              ];
+                          undefined,
+                          undefined
+                        ];
                       }
                       
                   }
@@ -1857,44 +1857,44 @@ function process_collision(dir, c1, c2, state) {
                     dec_health(o1$4);
                     dec_health(o2$5);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 case 2 :
                     if (o1$4.vel.x === 0) {
                       rev_dir(o2$5, t2$2, s2$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     } else {
                       dec_health(o2$5);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     }
                 case 3 :
                     if (o2$5.vel.x === 0) {
                       rev_dir(o1$4, t1, s1$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     } else {
                       dec_health(o1$4);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                     }
                 
               }
           case "Item" :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case "Block" :
               var o2$6 = c2._2;
               var t2$3 = c2._0;
@@ -1904,9 +1904,9 @@ function process_collision(dir, c1, c2, state) {
                 case "South" :
                     collide_block(undefined, dir, o1$4);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 case "East" :
                 case "West" :
                     exit$4 = 4;
@@ -1923,9 +1923,9 @@ function process_collision(dir, c1, c2, state) {
                           dec_health(o2$6);
                           reverse_left_right(o1$4);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                         exit$5 = 5;
                       } else {
@@ -1939,9 +1939,9 @@ function process_collision(dir, c1, c2, state) {
                           dec_health(o2$6);
                           reverse_left_right(o1$4);
                           return [
-                                  undefined,
-                                  undefined
-                                ];
+                            undefined,
+                            undefined
+                          ];
                         }
                         exit$5 = 5;
                       } else {
@@ -1956,17 +1956,17 @@ function process_collision(dir, c1, c2, state) {
                   case 5 :
                       rev_dir(o1$4, t1, s1$3);
                       return [
-                              undefined,
-                              undefined
-                            ];
+                        undefined,
+                        undefined
+                      ];
                   case 6 :
                       var updated_block$1 = evolve_block(o2$6, context);
                       var spawned_item$1 = spawn_above(o1$4.dir, o2$6, typ$2, context);
                       rev_dir(o1$4, t1, s1$3);
                       return [
-                              updated_block$1,
-                              spawned_item$1
-                            ];
+                        updated_block$1,
+                        spawned_item$1
+                      ];
                   
                 }
               }
@@ -1986,25 +1986,25 @@ function process_collision(dir, c1, c2, state) {
           case "Enemy" :
           case "Item" :
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case "Block" :
               switch (dir) {
                 case "North" :
                 case "South" :
-                    collide_block(undefined, dir, o2$7);
-                    return [
-                            undefined,
-                            undefined
-                          ];
+                    collide_block(undefined, dir, o2$7);
+                    return [
+                      undefined,
+                      undefined
+                    ];
                 case "East" :
                 case "West" :
                     reverse_left_right(o2$7);
                     return [
-                            undefined,
-                            undefined
-                          ];
+                      undefined,
+                      undefined
+                    ];
                 
               }
           
@@ -2012,9 +2012,9 @@ function process_collision(dir, c1, c2, state) {
         break;
     case "Block" :
         return [
-                undefined,
-                undefined
-              ];
+          undefined,
+          undefined
+        ];
     
   }
   switch (exit) {
@@ -2033,26 +2033,26 @@ function process_collision(dir, c1, c2, state) {
               update_score(state, 800);
               o2.score = 800;
               return [
-                      undefined,
-                      evolve_enemy(o1.dir, typ, s2, o2, context)
-                    ];
+                undefined,
+                evolve_enemy(o1.dir, typ, s2, o2, context)
+              ];
             }
             var score = Math.imul(100, state.multiplier);
             update_score(state, score);
             o2.score = score;
             state.multiplier = (state.multiplier << 1);
             return [
-                    undefined,
-                    evolve_enemy(o1.dir, typ, s2, o2, context)
-                  ];
+              undefined,
+              evolve_enemy(o1.dir, typ, s2, o2, context)
+            ];
         }
         var r2 = evolve_enemy(o1.dir, typ, s2, o2, context);
         o1.vel.y = - 4;
         o1.pos.y = o1.pos.y - 5;
         return [
-                undefined,
-                r2
-              ];
+          undefined,
+          r2
+        ];
     case 2 :
         switch (t2) {
           case "GKoopaShell" :
@@ -2062,15 +2062,15 @@ function process_collision(dir, c1, c2, state) {
             dec_health(o1$1);
             o1$1.invuln = 60;
             return [
-                    undefined,
-                    undefined
-                  ];
+              undefined,
+              undefined
+            ];
         }
         var r2$1 = o2$1.vel.x === 0 ? evolve_enemy(o1$1.dir, t2, s2$1, o2$1, context) : (dec_health(o1$1), o1$1.invuln = 60, undefined);
         return [
-                undefined,
-                r2$1
-              ];
+          undefined,
+          r2$1
+        ];
     case 3 :
         var exit$6 = 0;
         switch (t2$1) {
@@ -2086,9 +2086,9 @@ function process_collision(dir, c1, c2, state) {
               update_score(state, 1000);
               o2$2.score = 1000;
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           case "FireFlower" :
           case "Star" :
               exit$6 = 4;
@@ -2098,18 +2098,18 @@ function process_collision(dir, c1, c2, state) {
               dec_health(o2$2);
               update_score(state, 100);
               return [
-                      undefined,
-                      undefined
-                    ];
+                undefined,
+                undefined
+              ];
           
         }
         if (exit$6 === 4) {
           dec_health(o2$2);
           update_score(state, 1000);
           return [
-                  undefined,
-                  undefined
-                ];
+            undefined,
+            undefined
+          ];
         }
         break;
     
@@ -2119,12 +2119,12 @@ function process_collision(dir, c1, c2, state) {
 function broad_phase(collid, all_collids, state) {
   var obj = collid._2;
   return List.filter(function (c) {
-                if (in_viewport(state.vpt, obj.pos) || is_player(collid)) {
-                  return true;
-                } else {
-                  return out_of_viewport_below(state.vpt, obj.pos.y);
-                }
-              })(all_collids);
+          if (in_viewport(state.vpt, obj.pos) || is_player(collid)) {
+            return true;
+          } else {
+            return out_of_viewport_below(state.vpt, obj.pos.y);
+          }
+        })(all_collids);
 }
 
 function check_collisions(collid, all_collids, state) {
@@ -2160,21 +2160,21 @@ function check_collisions(collid, all_collids, state) {
     if (o !== undefined) {
       var o2 = new_objs[1];
       acc$1 = o2 !== undefined ? ({
-            hd: o,
-            tl: {
-              hd: o2,
-              tl: acc
-            }
-          }) : ({
-            hd: o,
+          hd: o,
+          tl: {
+            hd: o2,
             tl: acc
-          });
+          }
+        }) : ({
+          hd: o,
+          tl: acc
+        });
     } else {
       var o$1 = new_objs[1];
       acc$1 = o$1 !== undefined ? ({
-            hd: o$1,
-            tl: acc
-          }) : acc;
+          hd: o$1,
+          tl: acc
+        }) : acc;
     }
     _acc = acc$1;
     _cs = cs.tl;
@@ -2239,15 +2239,15 @@ function translate_keys(param) {
     tl: ctrls_1
   };
   return List.fold_left((function (a, x) {
-                if (x[0]) {
-                  return {
-                          hd: x[1],
-                          tl: a
-                        };
-                } else {
-                  return a;
-                }
-              }), /* [] */0, ctrls);
+          if (x[0]) {
+            return {
+              hd: x[1],
+              tl: a
+            };
+          } else {
+            return a;
+          }
+        }), /* [] */0, ctrls);
 }
 
 function run_update_collid(state, collid, all_collids) {
@@ -2483,15 +2483,15 @@ function convert_list(lst) {
   }
   var h = lst.hd;
   return Pervasives.$at({
-              hd: [
-                h[0],
-                [
-                  h[1][0] * 16,
-                  h[1][1] * 16
-                ]
-              ],
-              tl: /* [] */0
-            }, convert_list(lst.tl));
+        hd: [
+          h[0],
+          [
+            h[1][0] * 16,
+            h[1][1] * 16
+          ]
+        ],
+        tl: /* [] */0
+      }, convert_list(lst.tl));
 }
 
 function choose_enemy_typ(typ) {
@@ -2504,10 +2504,10 @@ function choose_enemy_typ(typ) {
         return "Goomba";
     default:
       throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Failure",
+        _1: "Shouldn't reach here",
+        Error: new Error()
+      };
   }
 }
 
@@ -2521,17 +2521,17 @@ function choose_sblock_typ(typ) {
         return "Cloud";
     case 3 :
         return {
-                TAG: "QBlock",
-                _0: "Mushroom"
-              };
+          TAG: "QBlock",
+          _0: "Mushroom"
+        };
     case 4 :
         return "Ground";
     default:
       throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Failure",
+        _1: "Shouldn't reach here",
+        Error: new Error()
+      };
   }
 }
 
@@ -2545,9 +2545,9 @@ function avoid_overlap(_lst, currentLst) {
     var h = lst.hd;
     if (!mem_loc(h[1], currentLst)) {
       return Pervasives.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, avoid_overlap(t, currentLst));
+            hd: h,
+            tl: /* [] */0
+          }, avoid_overlap(t, currentLst));
     }
     _lst = t;
     continue ;
@@ -2568,9 +2568,9 @@ function trim_edges(_lst, blockw, blockh) {
     var pixy = blockh * 16;
     if (!(cx < 128 || pixx - cx < 528 || cy === 0 || pixy - cy < 48)) {
       return Pervasives.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, trim_edges(t, blockw, blockh));
+            hd: h,
+            tl: /* [] */0
+          }, trim_edges(t, blockw, blockh));
     }
     _lst = t;
     continue ;
@@ -2582,15 +2582,15 @@ function generate_clouds(cbx, cby, typ, num) {
     return /* [] */0;
   } else {
     return Pervasives.$at({
-                hd: [
-                  typ,
-                  [
-                    cbx,
-                    cby
-                  ]
-                ],
-                tl: /* [] */0
-              }, generate_clouds(cbx + 1, cby, typ, num - 1 | 0));
+          hd: [
+            typ,
+            [
+              cbx,
+              cby
+            ]
+          ],
+          tl: /* [] */0
+        }, generate_clouds(cbx + 1, cby, typ, num - 1 | 0));
   }
 }
 
@@ -2607,15 +2607,15 @@ function generate_coins(_block_coord) {
       var xc = h[1][0];
       var yc = h[1][1];
       return Pervasives.$at({
-                  hd: [
-                    0,
-                    [
-                      xc,
-                      yc - 16
-                    ]
-                  ],
-                  tl: /* [] */0
-                }, generate_coins(t));
+            hd: [
+              0,
+              [
+                xc,
+                yc - 16
+              ]
+            ],
+            tl: /* [] */0
+          }, generate_coins(t));
     }
     _block_coord = t;
     continue ;
@@ -2634,64 +2634,64 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) {
     case 0 :
         if (blockw - cbx > 2) {
           return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      middle_block,
-                      [
-                        cbx + 1,
-                        cby
-                      ]
-                    ],
-                    tl: {
-                      hd: [
-                        stair_typ,
-                        [
-                          cbx + 2,
-                          cby
-                        ]
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                };
+            hd: [
+              stair_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: {
+              hd: [
+                middle_block,
+                [
+                  cbx + 1,
+                  cby
+                ]
+              ],
+              tl: {
+                hd: [
+                  stair_typ,
+                  [
+                    cbx + 2,
+                    cby
+                  ]
+                ],
+                tl: /* [] */0
+              }
+            }
+          };
         } else if (blockw - cbx > 1) {
           return {
-                  hd: [
-                    block_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      block_typ,
-                      [
-                        cbx + 1,
-                        cby
-                      ]
-                    ],
-                    tl: /* [] */0
-                  }
-                };
+            hd: [
+              block_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: {
+              hd: [
+                block_typ,
+                [
+                  cbx + 1,
+                  cby
+                ]
+              ],
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: [
-                    block_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
+            hd: [
+              block_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: /* [] */0
+          };
         }
     case 1 :
         var num_clouds = Random.$$int(5) + 5 | 0;
@@ -2958,95 +2958,95 @@ function choose_block_pattern(blockw, blockh, cbx, cby, prob) {
           return Pervasives.$at(one$2, Pervasives.$at(two$2, three$2));
         } else {
           return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
+            hd: [
+              stair_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: /* [] */0
+          };
         }
     case 4 :
         if (cby + 3 - blockh === 2) {
           return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
+            hd: [
+              stair_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: /* [] */0
+          };
         } else if (cby + 3 - blockh === 1) {
           return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      stair_typ,
-                      [
-                        cbx,
-                        cby + 1
-                      ]
-                    ],
-                    tl: /* [] */0
-                  }
-                };
+            hd: [
+              stair_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: {
+              hd: [
+                stair_typ,
+                [
+                  cbx,
+                  cby + 1
+                ]
+              ],
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      stair_typ,
-                      [
-                        cbx,
-                        cby + 1
-                      ]
-                    ],
-                    tl: {
-                      hd: [
-                        stair_typ,
-                        [
-                          cbx,
-                          cby + 2
-                        ]
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                };
-        }
-    case 5 :
-        return {
+            hd: [
+              stair_typ,
+              [
+                cbx,
+                cby
+              ]
+            ],
+            tl: {
+              hd: [
+                stair_typ,
+                [
+                  cbx,
+                  cby + 1
+                ]
+              ],
+              tl: {
                 hd: [
-                  3,
+                  stair_typ,
                   [
                     cbx,
-                    cby
+                    cby + 2
                   ]
                 ],
                 tl: /* [] */0
-              };
+              }
+            }
+          };
+        }
+    case 5 :
+        return {
+          hd: [
+            3,
+            [
+              cbx,
+              cby
+            ]
+          ],
+          tl: /* [] */0
+        };
     default:
       throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Failure",
+        _1: "Shouldn't reach here",
+        Error: new Error()
+      };
   }
 }
 
@@ -3103,15 +3103,15 @@ function generate_block_enemies(_block_coord) {
       var xc = h[1][0];
       var yc = h[1][1];
       return Pervasives.$at({
-                  hd: [
-                    enemy_typ,
-                    [
-                      xc,
-                      yc - 16
-                    ]
-                  ],
-                  tl: /* [] */0
-                }, generate_block_enemies(t));
+            hd: [
+              enemy_typ,
+              [
+                xc,
+                yc - 16
+              ]
+            ],
+            tl: /* [] */0
+          }, generate_block_enemies(t));
     }
     _block_coord = t;
     continue ;
@@ -3154,12 +3154,12 @@ function generate_block_locs(blockw, blockh, _cbx, _cby, _acc) {
 
 function generate_panel(context, blockw, blockh) {
   return spawn({
-              TAG: "SBlock",
-              _0: "Panel"
-            }, context, [
-              blockw * 16 - 256,
-              blockh * 16 * 2 / 3
-            ]);
+        TAG: "SBlock",
+        _0: "Panel"
+      }, context, [
+        blockw * 16 - 256,
+        blockh * 16 * 2 / 3
+      ]);
 }
 
 function generate_ground(blockw, blockh, _inc, _acc) {
@@ -3216,9 +3216,9 @@ function convert_to_block_obj(lst, context) {
         _0: sblock_typ
       }, context, h[1]);
   return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_block_obj(lst.tl, context));
+        hd: ob,
+        tl: /* [] */0
+      }, convert_to_block_obj(lst.tl, context));
 }
 
 function convert_to_enemy_obj(lst, context) {
@@ -3232,9 +3232,9 @@ function convert_to_enemy_obj(lst, context) {
         _0: senemy_typ
       }, context, h[1]);
   return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_enemy_obj(lst.tl, context));
+        hd: ob,
+        tl: /* [] */0
+      }, convert_to_enemy_obj(lst.tl, context));
 }
 
 function convert_to_coin_obj(lst, context) {
@@ -3246,9 +3246,9 @@ function convert_to_coin_obj(lst, context) {
         _0: "Coin"
       }, context, lst.hd[1]);
   return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_coin_obj(lst.tl, context));
+        hd: ob,
+        tl: /* [] */0
+      }, convert_to_coin_obj(lst.tl, context));
 }
 
 function generate_helper(blockw, blockh, cx, cy, context) {
@@ -3270,9 +3270,9 @@ function generate_helper(blockw, blockh, cx, cy, context) {
   var coin_objects = convert_to_coin_obj(undup_coin_locs, context);
   var obj_panel = generate_panel(context, blockw, blockh);
   return Pervasives.$at(all_blocks, Pervasives.$at(obj_converted_enemies, Pervasives.$at(coin_objects, Pervasives.$at(obj_enemy_blocks, {
-                          hd: obj_panel,
-                          tl: /* [] */0
-                        }))));
+                    hd: obj_panel,
+                    tl: /* [] */0
+                  }))));
 }
 
 function generate(w, h, context) {
@@ -3288,9 +3288,9 @@ function generate(w, h, context) {
         224
       ]);
   return [
-          player,
-          collide_list
-        ];
+    player,
+    collide_list
+  ];
 }
 
 function init(param) {
@@ -3316,10 +3316,10 @@ function load(param) {
   } else {
     console.log("cant find canvas " + canvas_id);
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "fail",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "fail",
+      Error: new Error()
+    };
   }
   var context = Curry._1(canvas.getContext, "2d");
   document.addEventListener("keydown", keydown, true);
@@ -3342,26 +3342,26 @@ function inc_counter(param) {
 
 function preload(param) {
   return List.map((function (img_src) {
-                var img_src$1 = "sprites/" + img_src;
-                var img = document.createElement("img");
-                img.src = img_src$1;
-                img.addEventListener("load", (function (ev) {
-                        inc_counter();
-                        return true;
-                      }), true);
-              }), {
-              hd: "blocks.png",
-              tl: {
-                hd: "items.png",
-                tl: {
-                  hd: "enemies.png",
-                  tl: {
-                    hd: "mario-small.png",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            });
+          var img_src$1 = "sprites/" + img_src;
+          var img = document.createElement("img");
+          img.src = img_src$1;
+          img.addEventListener("load", (function (ev) {
+                  inc_counter();
+                  return true;
+                }), true);
+        }), {
+        hd: "blocks.png",
+        tl: {
+          hd: "items.png",
+          tl: {
+            hd: "enemies.png",
+            tl: {
+              hd: "mario-small.png",
+              tl: /* [] */0
+            }
+          }
+        }
+      });
 }
 
 window.onload = (function (param) {
diff --git a/jscomp/test/marshal.js b/jscomp/test/marshal.js
index 358fadf11cf..45d6433826b 100644
--- a/jscomp/test/marshal.js
+++ b/jscomp/test/marshal.js
@@ -7,10 +7,10 @@ var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
 function to_buffer(buff, ofs, len, v, flags) {
   if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.to_buffer: substring out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Marshal.to_buffer: substring out of bounds",
+      Error: new Error()
+    };
   }
   return Caml_external_polyfill.resolve("output_value_to_buffer")(buff, ofs, len, v, flags);
 }
@@ -18,10 +18,10 @@ function to_buffer(buff, ofs, len, v, flags) {
 function data_size(buff, ofs) {
   if (ofs < 0 || ofs > (buff.length - 20 | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.data_size",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Marshal.data_size",
+      Error: new Error()
+    };
   }
   return Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs);
 }
@@ -33,18 +33,18 @@ function total_size(buff, ofs) {
 function from_bytes(buff, ofs) {
   if (ofs < 0 || ofs > (buff.length - 20 | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.from_bytes",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Marshal.from_bytes",
+      Error: new Error()
+    };
   }
   var len = Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs);
   if (ofs > (buff.length - (20 + len | 0) | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.from_bytes",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Marshal.from_bytes",
+      Error: new Error()
+    };
   }
   return Caml_external_polyfill.resolve("input_value_from_string")(buff, ofs);
 }
diff --git a/jscomp/test/method_name_test.js b/jscomp/test/method_name_test.js
index 75e9173f551..41c88d95deb 100644
--- a/jscomp/test/method_name_test.js
+++ b/jscomp/test/method_name_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/method_string_name.js b/jscomp/test/method_string_name.js
index 12d612f6937..2d883251bc3 100644
--- a/jscomp/test/method_string_name.js
+++ b/jscomp/test/method_string_name.js
@@ -11,8 +11,8 @@ console.log(f["Content-Type"]);
 function ff(x) {
   x["Content-Type"] = "hello";
   console.log(({
-          "Content-Type": "hello"
-        })["Content-Type"]);
+        "Content-Type": "hello"
+      })["Content-Type"]);
 }
 
 exports.f = f;
diff --git a/jscomp/test/miss_colon_test.js b/jscomp/test/miss_colon_test.js
index 6e985e6f45d..12da39d9ac7 100644
--- a/jscomp/test/miss_colon_test.js
+++ b/jscomp/test/miss_colon_test.js
@@ -10,9 +10,9 @@ function $plus$colon(_f, _g) {
       var n = f._0;
       if (g.TAG === "Int") {
         return {
-                TAG: "Int",
-                _0: n + g._0 | 0
-              };
+          TAG: "Int",
+          _0: n + g._0 | 0
+        };
       }
       if (n === 0) {
         return g;
@@ -23,10 +23,10 @@ function $plus$colon(_f, _g) {
       case "Int" :
           if (g._0 !== 0) {
             return {
-                    TAG: "Add",
-                    _0: f,
-                    _1: g
-                  };
+              TAG: "Add",
+              _0: f,
+              _1: g
+            };
           } else {
             return f;
           }
@@ -37,10 +37,10 @@ function $plus$colon(_f, _g) {
       case "Var" :
       case "Mul" :
           return {
-                  TAG: "Add",
-                  _0: f,
-                  _1: g
-                };
+            TAG: "Add",
+            _0: f,
+            _1: g
+          };
       
     }
   };
@@ -56,15 +56,15 @@ function $star$colon(_f, _g) {
       var n = f._0;
       if (g.TAG === "Int") {
         return {
-                TAG: "Int",
-                _0: Math.imul(n, g._0)
-              };
+          TAG: "Int",
+          _0: Math.imul(n, g._0)
+        };
       }
       if (n === 0) {
         return {
-                TAG: "Int",
-                _0: 0
-              };
+          TAG: "Int",
+          _0: 0
+        };
       }
       exit$1 = 3;
     } else {
@@ -74,9 +74,9 @@ function $star$colon(_f, _g) {
       if (g.TAG === "Int") {
         if (g._0 === 0) {
           return {
-                  TAG: "Int",
-                  _0: 0
-                };
+            TAG: "Int",
+            _0: 0
+          };
         }
         exit = 2;
       } else {
@@ -90,20 +90,20 @@ function $star$colon(_f, _g) {
       case "Int" :
           if (g._0 !== 1) {
             return {
-                    TAG: "Mul",
-                    _0: f,
-                    _1: g
-                  };
+              TAG: "Mul",
+              _0: f,
+              _1: g
+            };
           } else {
             return f;
           }
       case "Var" :
       case "Add" :
           return {
-                  TAG: "Mul",
-                  _0: f,
-                  _1: g
-                };
+            TAG: "Mul",
+            _0: f,
+            _1: g
+          };
       case "Mul" :
           _g = g._1;
           _f = $star$colon(f, g._0);
diff --git a/jscomp/test/module_alias_test.js b/jscomp/test/module_alias_test.js
index 27641813805..0c89bc97535 100644
--- a/jscomp/test/module_alias_test.js
+++ b/jscomp/test/module_alias_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/module_parameter_test.js b/jscomp/test/module_parameter_test.js
index 38ad674b1cf..a1443e9685c 100644
--- a/jscomp/test/module_parameter_test.js
+++ b/jscomp/test/module_parameter_test.js
@@ -24,10 +24,10 @@ var suites_0 = [
   "const",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: 1,
-              _1: v0
-            };
+        TAG: "Eq",
+        _0: 1,
+        _1: v0
+      };
     })
 ];
 
@@ -36,10 +36,10 @@ var suites_1 = {
     "other",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: 3,
-                _1: "abc".length
-              };
+          TAG: "Eq",
+          _0: 3,
+          _1: "abc".length
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/module_splice_test.js b/jscomp/test/module_splice_test.js
index d96e7d797a9..3f97fe88f5f 100644
--- a/jscomp/test/module_splice_test.js
+++ b/jscomp/test/module_splice_test.js
@@ -22,10 +22,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/more_poly_variant_test.js b/jscomp/test/more_poly_variant_test.js
index 6f66db6971d..27ae52ec7f9 100644
--- a/jscomp/test/more_poly_variant_test.js
+++ b/jscomp/test/more_poly_variant_test.js
@@ -8,25 +8,25 @@ function map(f, x) {
   }
   var match = x.VAL;
   return {
-          NAME: "Cons",
-          VAL: [
-            f(match[0]),
-            map(f, match[1])
-          ]
-        };
+    NAME: "Cons",
+    VAL: [
+      f(match[0]),
+      map(f, match[1])
+    ]
+  };
 }
 
 function split_cases(x) {
   if (typeof x === "object" && x.NAME === "Snoc") {
     return {
-            NAME: "B",
-            VAL: x
-          };
+      NAME: "B",
+      VAL: x
+    };
   } else {
     return {
-            NAME: "A",
-            VAL: x
-          };
+      NAME: "A",
+      VAL: x
+    };
   }
 }
 
diff --git a/jscomp/test/mpr_6033_test.js b/jscomp/test/mpr_6033_test.js
index 79fe5079308..b5859531ac2 100644
--- a/jscomp/test/mpr_6033_test.js
+++ b/jscomp/test/mpr_6033_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/mt.js b/jscomp/test/mt.js
index e9335cc3cd1..a15a71fda01 100644
--- a/jscomp/test/mt.js
+++ b/jscomp/test/mt.js
@@ -258,10 +258,10 @@ function eq_suites(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -275,9 +275,9 @@ function bool_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: x
-                };
+            TAG: "Ok",
+            _0: x
+          };
         })
     ],
     tl: suites.contents
@@ -291,9 +291,9 @@ function throw_suites(test_id, suites, loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: x
-                };
+            TAG: "ThrowAny",
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/mt_global.js b/jscomp/test/mt_global.js
index 9b21f8ad903..75666e18db7 100644
--- a/jscomp/test/mt_global.js
+++ b/jscomp/test/mt_global.js
@@ -9,10 +9,10 @@ function collect_eq(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -26,10 +26,10 @@ function collect_neq(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Neq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -43,10 +43,10 @@ function collect_approx(test_id, suites, loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Approx",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Approx",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/mutable_obj_test.js b/jscomp/test/mutable_obj_test.js
index cfba990f99a..724b5f47d00 100644
--- a/jscomp/test/mutable_obj_test.js
+++ b/jscomp/test/mutable_obj_test.js
@@ -5,9 +5,9 @@
 function f(x) {
   x.dec = (function (x) {
       return {
-              x: x,
-              y: x
-            };
+        x: x,
+        y: x
+      };
     });
 }
 
diff --git a/jscomp/test/mutable_uncurry_test.js b/jscomp/test/mutable_uncurry_test.js
index b8d763355f1..f2026f4dea0 100644
--- a/jscomp/test/mutable_uncurry_test.js
+++ b/jscomp/test/mutable_uncurry_test.js
@@ -45,10 +45,10 @@ function ut3(param, param$1, param$2) {
   var x1 = param$1.contents;
   var x2 = param$2.contents;
   return [
-          x0,
-          x1,
-          x2
-        ];
+    x0,
+    x1,
+    x2
+  ];
 }
 
 function t3(param) {
@@ -58,10 +58,10 @@ function t3(param) {
     return function (param) {
       var x2 = param.contents;
       return [
-              x0,
-              x1,
-              x2
-            ];
+        x0,
+        x1,
+        x2
+      ];
     };
   };
 }
@@ -70,17 +70,17 @@ function ut4(param, param$1, param$2, param$3) {
   var x0 = param.contents;
   var x1 = param$1.contents;
   return Curry._2((function (param) {
-                var x2 = param.contents;
-                return function (param) {
-                  var x3 = param.contents;
-                  return [
-                          x0,
-                          x1,
-                          x2,
-                          x3
-                        ];
-                };
-              }), param$2, param$3);
+          var x2 = param.contents;
+          return function (param) {
+            var x3 = param.contents;
+            return [
+              x0,
+              x1,
+              x2,
+              x3
+            ];
+          };
+        }), param$2, param$3);
 }
 
 function t4(param) {
@@ -92,11 +92,11 @@ function t4(param) {
       return function (param) {
         var x3 = param.contents;
         return [
-                x0,
-                x1,
-                x2,
-                x3
-              ];
+          x0,
+          x1,
+          x2,
+          x3
+        ];
       };
     };
   };
@@ -106,21 +106,21 @@ function ut5(param, param$1, param$2, param$3, param$4) {
   var x0 = param.contents;
   var x1 = param$1.contents;
   return Curry._3((function (param) {
-                var x2 = param.contents;
-                return function (param) {
-                  var x3 = param.contents;
-                  return function (param) {
-                    var x4 = param.contents;
-                    return [
-                            x0,
-                            x1,
-                            x2,
-                            x3,
-                            x4
-                          ];
-                  };
-                };
-              }), param$2, param$3, param$4);
+          var x2 = param.contents;
+          return function (param) {
+            var x3 = param.contents;
+            return function (param) {
+              var x4 = param.contents;
+              return [
+                x0,
+                x1,
+                x2,
+                x3,
+                x4
+              ];
+            };
+          };
+        }), param$2, param$3, param$4);
 }
 
 function t5(param) {
@@ -134,12 +134,12 @@ function t5(param) {
         return function (param) {
           var x4 = param.contents;
           return [
-                  x0,
-                  x1,
-                  x2,
-                  x3,
-                  x4
-                ];
+            x0,
+            x1,
+            x2,
+            x3,
+            x4
+          ];
         };
       };
     };
diff --git a/jscomp/test/name_mangle_test.js b/jscomp/test/name_mangle_test.js
index b5d42a4dcac..fd7928e34e7 100644
--- a/jscomp/test/name_mangle_test.js
+++ b/jscomp/test/name_mangle_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/nested_module_alias.js b/jscomp/test/nested_module_alias.js
index eaa04d2496d..0001c46efe3 100644
--- a/jscomp/test/nested_module_alias.js
+++ b/jscomp/test/nested_module_alias.js
@@ -5,9 +5,9 @@ var List = require("../../lib/js/list.js");
 
 function v(x) {
   return [
-          List.length(x),
-          List.length(x)
-        ];
+    List.length(x),
+    List.length(x)
+  ];
 }
 
 var L;
diff --git a/jscomp/test/noassert.js b/jscomp/test/noassert.js
index fb1c0f0c3d1..735a8a431d4 100644
--- a/jscomp/test/noassert.js
+++ b/jscomp/test/noassert.js
@@ -4,14 +4,14 @@
 
 function f(param) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "noassert.res",
-          1,
-          14
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "noassert.res",
+      1,
+      14
+    ],
+    Error: new Error()
+  };
 }
 
 function h(param) {
diff --git a/jscomp/test/obj_magic_test.js b/jscomp/test/obj_magic_test.js
index d11f762e808..d1128b24e9f 100644
--- a/jscomp/test/obj_magic_test.js
+++ b/jscomp/test/obj_magic_test.js
@@ -11,10 +11,10 @@ var suites_0 = [
   "is_block_test1",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: false,
-              _1: "number" !== "number"
-            };
+        TAG: "Eq",
+        _0: false,
+        _1: "number" !== "number"
+      };
     })
 ];
 
@@ -23,13 +23,13 @@ var suites_1 = {
     "is_block_test2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: true,
-                _1: typeof ({
-                    hd: 3,
-                    tl: /* [] */0
-                  }) !== "number"
-              };
+          TAG: "Eq",
+          _0: true,
+          _1: typeof ({
+            hd: 3,
+            tl: /* [] */0
+          }) !== "number"
+        };
       })
   ],
   tl: {
@@ -37,10 +37,10 @@ var suites_1 = {
       "is_block_test3",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: "string" !== "number"
-                };
+            TAG: "Eq",
+            _0: true,
+            _1: "string" !== "number"
+          };
         })
     ],
     tl: {
@@ -48,10 +48,10 @@ var suites_1 = {
         "is_block_test4",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: "number" !== "number"
-                  };
+              TAG: "Eq",
+              _0: false,
+              _1: "number" !== "number"
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js
index 33adfd510c2..37d8cfc1e8a 100644
--- a/jscomp/test/ocaml_re_test.js
+++ b/jscomp/test/ocaml_re_test.js
@@ -34,10 +34,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -64,21 +64,21 @@ function union(_l, _l$p) {
     var c1 = match$1[0];
     if ((c2 + 1 | 0) < c1$p) {
       return {
-              hd: [
-                c1,
-                c2
-              ],
-              tl: union(r, l$p)
-            };
+        hd: [
+          c1,
+          c2
+        ],
+        tl: union(r, l$p)
+      };
     }
     if ((c2$p + 1 | 0) < c1) {
       return {
-              hd: [
-                c1$p,
-                c2$p
-              ],
-              tl: union(l, r$p)
-            };
+        hd: [
+          c1$p,
+          c2$p
+        ],
+        tl: union(l, r$p)
+      };
     }
     if (c2 < c2$p) {
       _l$p = {
@@ -128,20 +128,20 @@ function inter(_l, _l$p) {
     if (!Caml_obj.lessthan(c2$p, c1)) {
       if (Caml_obj.lessthan(c2, c2$p)) {
         return {
-                hd: [
-                  Caml_obj.max(c1, c1$p),
-                  c2
-                ],
-                tl: inter(r, l$p)
-              };
+          hd: [
+            Caml_obj.max(c1, c1$p),
+            c2
+          ],
+          tl: inter(r, l$p)
+        };
       } else {
         return {
-                hd: [
-                  Caml_obj.max(c1, c1$p),
-                  c2$p
-                ],
-                tl: inter(l, r$p)
-              };
+          hd: [
+            Caml_obj.max(c1, c1$p),
+            c2$p
+          ],
+          tl: inter(l, r$p)
+        };
       }
     }
     _l$p = r$p;
@@ -169,32 +169,32 @@ function diff(_l, _l$p) {
     var c1 = match$1[0];
     if (c2 < c1$p) {
       return {
-              hd: [
-                c1,
-                c2
-              ],
-              tl: diff(r, l$p)
-            };
+        hd: [
+          c1,
+          c2
+        ],
+        tl: diff(r, l$p)
+      };
     }
     if (c2$p < c1) {
       _l$p = r$p;
       continue ;
     }
     var r$p$p = c2$p < c2 ? ({
-          hd: [
-            c2$p + 1 | 0,
-            c2
-          ],
-          tl: r
-        }) : r;
+        hd: [
+          c2$p + 1 | 0,
+          c2
+        ],
+        tl: r
+      }) : r;
     if (c1 < c1$p) {
       return {
-              hd: [
-                c1,
-                c1$p - 1 | 0
-              ],
-              tl: diff(r$p$p, r$p)
-            };
+        hd: [
+          c1,
+          c1$p - 1 | 0
+        ],
+        tl: diff(r$p$p, r$p)
+      };
     }
     _l$p = r$p;
     _l = r$p$p;
@@ -204,31 +204,31 @@ function diff(_l, _l$p) {
 
 function single(c) {
   return {
-          hd: [
-            c,
-            c
-          ],
-          tl: /* [] */0
-        };
+    hd: [
+      c,
+      c
+    ],
+    tl: /* [] */0
+  };
 }
 
 function seq(c, c$p) {
   if (Caml_obj.lessequal(c, c$p)) {
     return {
-            hd: [
-              c,
-              c$p
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        c,
+        c$p
+      ],
+      tl: /* [] */0
+    };
   } else {
     return {
-            hd: [
-              c$p,
-              c
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        c$p,
+        c
+      ],
+      tl: /* [] */0
+    };
   }
 }
 
@@ -238,12 +238,12 @@ function offset(o, l) {
   }
   var match = l.hd;
   return {
-          hd: [
-            match[0] + o | 0,
-            match[1] + o | 0
-          ],
-          tl: offset(o, l.tl)
-        };
+    hd: [
+      match[0] + o | 0,
+      match[1] + o | 0
+    ],
+    tl: offset(o, l.tl)
+  };
 }
 
 function mem(c, _s) {
@@ -305,13 +305,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -322,10 +322,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -338,27 +338,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -371,22 +371,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -398,13 +398,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -503,12 +503,12 @@ function create$1(l, v, r) {
   var hr;
   hr = typeof r !== "object" ? 0 : r.h;
   return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal$1(l, v, r) {
@@ -519,10 +519,10 @@ function bal$1(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var lv = l.v;
@@ -534,26 +534,26 @@ function bal$1(l, v, r) {
       return create$1(create$1(ll, lv, lr.l), lr.v, create$1(lr.r, v, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rv = r.v;
@@ -565,21 +565,21 @@ function bal$1(l, v, r) {
     return create$1(create$1(l, v, rl.l), rl.v, create$1(rl.r, rv, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Set.bal",
+    Error: new Error()
+  };
 }
 
 function add$1(x, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var v = param.v;
@@ -638,20 +638,20 @@ function marks_set_idx(idx, x) {
     return x;
   } else {
     return {
-            hd: [
-              match[0],
-              idx
-            ],
-            tl: marks_set_idx(idx, x.tl)
-          };
+      hd: [
+        match[0],
+        idx
+      ],
+      tl: marks_set_idx(idx, x.tl)
+    };
   }
 }
 
 function marks_set_idx$1(marks, idx) {
   return {
-          marks: marks_set_idx(idx, marks.marks),
-          pmarks: marks.pmarks
-        };
+    marks: marks_set_idx(idx, marks.marks),
+    pmarks: marks.pmarks
+  };
 }
 
 function first(f, _x) {
@@ -677,22 +677,22 @@ var eps_expr = {
 function mk_expr(ids, def) {
   ids.contents = ids.contents + 1 | 0;
   return {
-          id: ids.contents,
-          def: def
-        };
+    id: ids.contents,
+    def: def
+  };
 }
 
 function cst(ids, s) {
   if (s ? false : true) {
     return mk_expr(ids, {
-                TAG: "Alt",
-                _0: /* [] */0
-              });
+          TAG: "Alt",
+          _0: /* [] */0
+        });
   } else {
     return mk_expr(ids, {
-                TAG: "Cst",
-                _0: s
-              });
+          TAG: "Cst",
+          _0: s
+        });
   }
 }
 
@@ -700,17 +700,17 @@ function alt(ids, x) {
   if (x) {
     if (x.tl) {
       return mk_expr(ids, {
-                  TAG: "Alt",
-                  _0: x
-                });
+            TAG: "Alt",
+            _0: x
+          });
     } else {
       return x.hd;
     }
   } else {
     return mk_expr(ids, {
-                TAG: "Alt",
-                _0: /* [] */0
-              });
+          TAG: "Alt",
+          _0: /* [] */0
+        });
   }
 }
 
@@ -741,11 +741,11 @@ function seq$1(ids, kind, x, y) {
     
   }
   return mk_expr(ids, {
-              TAG: "Seq",
-              _0: kind,
-              _1: x,
-              _2: y
-            });
+        TAG: "Seq",
+        _0: kind,
+        _1: x,
+        _2: y
+      });
 }
 
 function is_eps(expr) {
@@ -759,19 +759,19 @@ function is_eps(expr) {
 
 function rep(ids, kind, sem, x) {
   return mk_expr(ids, {
-              TAG: "Rep",
-              _0: kind,
-              _1: sem,
-              _2: x
-            });
+        TAG: "Rep",
+        _0: kind,
+        _1: sem,
+        _2: x
+      });
 }
 
 function erase(ids, m, m$p) {
   return mk_expr(ids, {
-              TAG: "Erase",
-              _0: m,
-              _1: m$p
-            });
+        TAG: "Erase",
+        _0: m,
+        _1: m$p
+      });
 }
 
 function rename(ids, x) {
@@ -782,25 +782,25 @@ function rename(ids, x) {
   switch (l.TAG) {
     case "Alt" :
         return mk_expr(ids, {
-                    TAG: "Alt",
-                    _0: List.map((function (param) {
-                            return rename(ids, param);
-                          }), l._0)
-                  });
+              TAG: "Alt",
+              _0: List.map((function (param) {
+                      return rename(ids, param);
+                    }), l._0)
+            });
     case "Seq" :
         return mk_expr(ids, {
-                    TAG: "Seq",
-                    _0: l._0,
-                    _1: rename(ids, l._1),
-                    _2: rename(ids, l._2)
-                  });
+              TAG: "Seq",
+              _0: l._0,
+              _1: rename(ids, l._1),
+              _2: rename(ids, l._2)
+            });
     case "Rep" :
         return mk_expr(ids, {
-                    TAG: "Rep",
-                    _0: l._0,
-                    _1: l._1,
-                    _2: rename(ids, l._2)
-                  });
+              TAG: "Rep",
+              _0: l._0,
+              _1: l._1,
+              _2: rename(ids, l._2)
+            });
     default:
       return mk_expr(ids, x.def);
   }
@@ -920,13 +920,13 @@ function tseq(kind, x, y, rem) {
         var tmp = match._1.def;
         if (typeof tmp !== "object" && !x.tl) {
           return {
-                  hd: {
-                    TAG: "TExp",
-                    _0: match._0,
-                    _1: y
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: "TExp",
+              _0: match._0,
+              _1: y
+            },
+            tl: rem
+          };
         }
         break;
     case "TSeq" :
@@ -935,14 +935,14 @@ function tseq(kind, x, y, rem) {
     
   }
   return {
-          hd: {
-            TAG: "TSeq",
-            _0: x,
-            _1: y,
-            _2: kind
-          },
-          tl: rem
-        };
+    hd: {
+      TAG: "TSeq",
+      _0: x,
+      _1: y,
+      _2: kind
+    },
+    tl: rem
+  };
 }
 
 var dummy = {
@@ -959,23 +959,23 @@ function hash$2(idx, cat, desc) {
 
 function mk(idx, cat, desc) {
   return {
-          idx: idx,
-          category: cat,
-          desc: desc,
-          status: undefined,
-          hash: hash$2(idx, cat, desc)
-        };
+    idx: idx,
+    category: cat,
+    desc: desc,
+    status: undefined,
+    hash: hash$2(idx, cat, desc)
+  };
 }
 
 function create$2(cat, e) {
   return mk(0, cat, {
-              hd: {
-                TAG: "TExp",
-                _0: empty,
-                _1: e
-              },
-              tl: /* [] */0
-            });
+        hd: {
+          TAG: "TExp",
+          _0: empty,
+          _1: e
+        },
+        tl: /* [] */0
+      });
 }
 
 function equal$1(x, y) {
@@ -1002,22 +1002,22 @@ function reset_table(a) {
 function mark_used_indices(tbl) {
   return function (param) {
     return List.iter((function (x) {
-                  switch (x.TAG) {
-                    case "TSeq" :
-                        return mark_used_indices(tbl)(x._0);
-                    case "TExp" :
-                    case "TMatch" :
-                        break;
+            switch (x.TAG) {
+              case "TSeq" :
+                  return mark_used_indices(tbl)(x._0);
+              case "TExp" :
+              case "TMatch" :
+                  break;
+              
+            }
+            List.iter((function (param) {
+                    var i = param[1];
+                    if (i >= 0) {
+                      return Caml_array.set(tbl, i, true);
+                    }
                     
-                  }
-                  List.iter((function (param) {
-                          var i = param[1];
-                          if (i >= 0) {
-                            return Caml_array.set(tbl, i, true);
-                          }
-                          
-                        }), x._0.marks);
-                }), param);
+                  }), x._0.marks);
+          }), param);
   };
 }
 
@@ -1072,21 +1072,21 @@ function split_at_match_rec(_l$p, _x) {
             continue ;
         case "TMatch" :
             return [
-                    List.rev(l$p),
-                    Curry._1(remove_matches, x.tl)
-                  ];
+              List.rev(l$p),
+              Curry._1(remove_matches, x.tl)
+            ];
         
       }
     } else {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "ocaml_re_test.res",
-              816,
-              16
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "ocaml_re_test.res",
+          816,
+          16
+        ],
+        Error: new Error()
+      };
     }
   };
 }
@@ -1096,9 +1096,9 @@ function remove_duplicates(prev, _l, y) {
     var l = _l;
     if (!l) {
       return [
-              /* [] */0,
-              prev
-            ];
+        /* [] */0,
+        prev
+      ];
     }
     var x = l.hd;
     switch (x.TAG) {
@@ -1107,9 +1107,9 @@ function remove_duplicates(prev, _l, y) {
           var match = remove_duplicates(prev, x._0, x$1);
           var match$1 = remove_duplicates(match[1], l.tl, y);
           return [
-                  tseq(x._2, match[0], x$1, match$1[0]),
-                  match$1[1]
-                ];
+            tseq(x._2, match[0], x$1, match$1[0]),
+            match$1[1]
+          ];
       case "TExp" :
           var x$2 = x._1;
           var tmp = x$2.def;
@@ -1124,12 +1124,12 @@ function remove_duplicates(prev, _l, y) {
                   tl: prev
                 }, r, y);
             return [
-                    {
-                      hd: x,
-                      tl: match$2[0]
-                    },
-                    match$2[1]
-                  ];
+              {
+                hd: x,
+                tl: match$2[0]
+              },
+              match$2[1]
+            ];
           }
           var r$1 = l.tl;
           if (List.memq(x$2.id, prev)) {
@@ -1141,20 +1141,20 @@ function remove_duplicates(prev, _l, y) {
                 tl: prev
               }, r$1, y);
           return [
-                  {
-                    hd: x,
-                    tl: match$3[0]
-                  },
-                  match$3[1]
-                ];
+            {
+              hd: x,
+              tl: match$3[0]
+            },
+            match$3[1]
+          ];
       case "TMatch" :
           return [
-                  {
-                    hd: x,
-                    tl: /* [] */0
-                  },
-                  prev
-                ];
+            {
+              hd: x,
+              tl: /* [] */0
+            },
+            prev
+          ];
       
     }
   };
@@ -1168,71 +1168,71 @@ function set_idx(idx, x) {
   switch (marks.TAG) {
     case "TSeq" :
         return {
-                hd: {
-                  TAG: "TSeq",
-                  _0: set_idx(idx, marks._0),
-                  _1: marks._1,
-                  _2: marks._2
-                },
-                tl: set_idx(idx, x.tl)
-              };
+          hd: {
+            TAG: "TSeq",
+            _0: set_idx(idx, marks._0),
+            _1: marks._1,
+            _2: marks._2
+          },
+          tl: set_idx(idx, x.tl)
+        };
     case "TExp" :
         return {
-                hd: {
-                  TAG: "TExp",
-                  _0: marks_set_idx$1(marks._0, idx),
-                  _1: marks._1
-                },
-                tl: set_idx(idx, x.tl)
-              };
+          hd: {
+            TAG: "TExp",
+            _0: marks_set_idx$1(marks._0, idx),
+            _1: marks._1
+          },
+          tl: set_idx(idx, x.tl)
+        };
     case "TMatch" :
         return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks_set_idx$1(marks._0, idx)
-                },
-                tl: set_idx(idx, x.tl)
-              };
+          hd: {
+            TAG: "TMatch",
+            _0: marks_set_idx$1(marks._0, idx)
+          },
+          tl: set_idx(idx, x.tl)
+        };
     
   }
 }
 
 function filter_marks(b, e, marks) {
   return {
-          marks: List.filter(function (param) {
-                  var i = param[0];
-                  if (i < b) {
-                    return true;
-                  } else {
-                    return i > e;
-                  }
-                })(marks.marks),
-          pmarks: marks.pmarks
-        };
+    marks: List.filter(function (param) {
+            var i = param[0];
+            if (i < b) {
+              return true;
+            } else {
+              return i > e;
+            }
+          })(marks.marks),
+    pmarks: marks.pmarks
+  };
 }
 
 function delta_1(marks, c, next_cat, prev_cat, x, rem) {
   var s = x.def;
   if (typeof s !== "object") {
     return {
-            hd: {
-              TAG: "TMatch",
-              _0: marks
-            },
-            tl: rem
-          };
+      hd: {
+        TAG: "TMatch",
+        _0: marks
+      },
+      tl: rem
+    };
   }
   switch (s.TAG) {
     case "Cst" :
         if (mem(c, s._0)) {
           return {
-                  hd: {
-                    TAG: "TExp",
-                    _0: marks,
-                    _1: eps_expr
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: "TExp",
+              _0: marks,
+              _1: eps_expr
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
@@ -1264,20 +1264,20 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
         var y$p$p = match[0];
         if (s._0 === "Non_greedy") {
           return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: tseq(kind, y$p$p, x, rem)
-                };
+            hd: {
+              TAG: "TMatch",
+              _0: marks
+            },
+            tl: tseq(kind, y$p$p, x, rem)
+          };
         } else {
           return tseq(kind, y$p$p, x, {
-                      hd: {
-                        TAG: "TMatch",
-                        _0: match[1]
-                      },
-                      tl: rem
-                    });
+                hd: {
+                  TAG: "TMatch",
+                  _0: match[1]
+                },
+                tl: rem
+              });
         }
     case "Mark" :
         var i = s._0;
@@ -1294,41 +1294,41 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
           pmarks: marks_pmarks
         };
         return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks$1
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: "TMatch",
+            _0: marks$1
+          },
+          tl: rem
+        };
     case "Erase" :
         return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: filter_marks(s._0, s._1, marks)
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: "TMatch",
+            _0: filter_marks(s._0, s._1, marks)
+          },
+          tl: rem
+        };
     case "Before" :
         if (intersect(next_cat, s._0)) {
           return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: "TMatch",
+              _0: marks
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
     case "After" :
         if (intersect(prev_cat, s._0)) {
           return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: rem
-                };
+            hd: {
+              TAG: "TMatch",
+              _0: marks
+            },
+            tl: rem
+          };
         } else {
           return rem;
         }
@@ -1340,12 +1340,12 @@ function delta_1(marks, c, next_cat, prev_cat, x, rem) {
           pmarks: marks_pmarks$1
         };
         return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks$2
-                },
-                tl: rem
-              };
+          hd: {
+            TAG: "TMatch",
+            _0: marks$2
+          },
+          tl: rem
+        };
     
   }
 }
@@ -1394,9 +1394,9 @@ function delta_4(c, next_cat, prev_cat, l, rem) {
           return delta_1(x._0, c, next_cat, prev_cat, x._1, rem$1);
       case "TMatch" :
           return {
-                  hd: x,
-                  tl: rem$1
-                };
+            hd: x,
+            tl: rem$1
+          };
       
     }
   } else {
@@ -1510,12 +1510,12 @@ function mk_state(ncol, desc) {
   var break_state;
   break_state = typeof match !== "object" && match !== "Failed" ? false : true;
   return {
-          idx: break_state ? -3 : desc.idx,
-          real_idx: desc.idx,
-          next: break_state ? dummy_next : Caml_array.make(ncol, unknown_state),
-          final: /* [] */0,
-          desc: desc
-        };
+    idx: break_state ? -3 : desc.idx,
+    real_idx: desc.idx,
+    next: break_state ? dummy_next : Caml_array.make(ncol, unknown_state),
+    final: /* [] */0,
+    desc: desc
+  };
 }
 
 function find_state(re, desc) {
@@ -1735,9 +1735,9 @@ function trans_set(cache, cm, s) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = compare(v, param.v);
       if (c === 0) {
@@ -1857,12 +1857,12 @@ function colorize(c, regexp) {
           case "Beg_of_line" :
           case "End_of_line" :
               return split({
-                          hd: [
-                            /* '\n' */10,
-                            /* '\n' */10
-                          ],
-                          tl: /* [] */0
-                        }, c);
+                    hd: [
+                      /* '\n' */10,
+                      /* '\n' */10
+                    ],
+                    tl: /* [] */0
+                  }, c);
           case "Beg_of_word" :
           case "End_of_word" :
           case "Not_bound" :
@@ -1897,14 +1897,14 @@ function colorize(c, regexp) {
               continue ;
           default:
             throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "ocaml_re_test.res",
-                    2169,
-                    8
-                  ],
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Assert_failure",
+              _1: [
+                "ocaml_re_test.res",
+                2169,
+                8
+              ],
+              Error: new Error()
+            };
         }
       }
     };
@@ -1927,10 +1927,10 @@ function flatten_cmap(cm) {
     Caml_bytes.set(col_repr, v, Char.chr(i));
   }
   return [
-          c,
-          Bytes.sub(col_repr, 0, v + 1 | 0),
-          v + 1 | 0
-        ];
+    c,
+    Bytes.sub(col_repr, 0, v + 1 | 0),
+    v + 1 | 0
+  ];
 }
 
 function equal$2(_x1, _x2) {
@@ -2177,9 +2177,9 @@ function sequence(x) {
     return x.hd;
   } else {
     return {
-            TAG: "Sequence",
-            _0: x
-          };
+      TAG: "Sequence",
+      _0: x
+    };
   }
 }
 
@@ -2208,27 +2208,27 @@ function merge_sequences(_x) {
                   if (match$2) {
                     if (equal$2(x$1, match$2.hd)) {
                       return {
+                        hd: {
+                          TAG: "Sequence",
+                          _0: {
+                            hd: x$1,
+                            tl: {
                               hd: {
-                                TAG: "Sequence",
+                                TAG: "Alternative",
                                 _0: {
-                                  hd: x$1,
+                                  hd: sequence(y),
                                   tl: {
-                                    hd: {
-                                      TAG: "Alternative",
-                                      _0: {
-                                        hd: sequence(y),
-                                        tl: {
-                                          hd: sequence(match$2.tl),
-                                          tl: /* [] */0
-                                        }
-                                      }
-                                    },
+                                    hd: sequence(match$2.tl),
                                     tl: /* [] */0
                                   }
                                 }
                               },
-                              tl: r$p.tl
-                            };
+                              tl: /* [] */0
+                            }
+                          }
+                        },
+                        tl: r$p.tl
+                      };
                     }
                     exit = 2;
                   } else {
@@ -2240,15 +2240,15 @@ function merge_sequences(_x) {
               }
               if (exit === 2) {
                 return {
-                        hd: {
-                          TAG: "Sequence",
-                          _0: {
-                            hd: x$1,
-                            tl: y
-                          }
-                        },
-                        tl: r$p
-                      };
+                  hd: {
+                    TAG: "Sequence",
+                    _0: {
+                      hd: x$1,
+                      tl: y
+                    }
+                  },
+                  tl: r$p
+                };
               }
               
             }
@@ -2261,9 +2261,9 @@ function merge_sequences(_x) {
       }
     }
     return {
-            hd: l$p,
-            tl: merge_sequences(x.tl)
-          };
+      hd: l$p,
+      tl: merge_sequences(x.tl)
+    };
   };
 }
 
@@ -2285,143 +2285,143 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
         case "Beg_of_line" :
             var c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
             return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: c$1
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "After",
+                    _0: c$1
+                  }),
+              kind
+            ];
         case "End_of_line" :
             var c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
             return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: c$2
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "Before",
+                    _0: c$2
+                  }),
+              kind
+            ];
         case "Beg_of_word" :
             var c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
             var c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
             return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "After",
-                              _0: c$3
-                            }), mk_expr(ids, {
-                              TAG: "Before",
-                              _0: c$4
-                            })),
-                    kind
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: "After",
+                        _0: c$3
+                      }), mk_expr(ids, {
+                        TAG: "Before",
+                        _0: c$4
+                      })),
+              kind
+            ];
         case "End_of_word" :
             var c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
             var c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
             return [
-                    seq$1(ids, "First", mk_expr(ids, {
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: "After",
+                        _0: c$5
+                      }), mk_expr(ids, {
+                        TAG: "Before",
+                        _0: c$6
+                      })),
+              kind
+            ];
+        case "Not_bound" :
+            return [
+              alt(ids, {
+                    hd: seq$1(ids, "First", mk_expr(ids, {
                               TAG: "After",
-                              _0: c$5
+                              _0: Re_automata_Category.letter
                             }), mk_expr(ids, {
                               TAG: "Before",
-                              _0: c$6
+                              _0: Re_automata_Category.letter
                             })),
-                    kind
-                  ];
-        case "Not_bound" :
-            return [
-                    alt(ids, {
-                          hd: seq$1(ids, "First", mk_expr(ids, {
-                                    TAG: "After",
-                                    _0: Re_automata_Category.letter
-                                  }), mk_expr(ids, {
-                                    TAG: "Before",
-                                    _0: Re_automata_Category.letter
-                                  })),
-                          tl: {
-                            hd: seq$1(ids, "First", mk_expr(ids, {
-                                      TAG: "After",
-                                      _0: Re_automata_Category.letter
-                                    }), mk_expr(ids, {
-                                      TAG: "Before",
-                                      _0: Re_automata_Category.letter
-                                    })),
-                            tl: /* [] */0
-                          }
-                        }),
-                    kind
-                  ];
+                    tl: {
+                      hd: seq$1(ids, "First", mk_expr(ids, {
+                                TAG: "After",
+                                _0: Re_automata_Category.letter
+                              }), mk_expr(ids, {
+                                TAG: "Before",
+                                _0: Re_automata_Category.letter
+                              })),
+                      tl: /* [] */0
+                    }
+                  }),
+              kind
+            ];
         case "Beg_of_str" :
             return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "After",
+                    _0: Re_automata_Category.inexistant
+                  }),
+              kind
+            ];
         case "End_of_str" :
             return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "Before",
+                    _0: Re_automata_Category.inexistant
+                  }),
+              kind
+            ];
         case "Last_end_of_line" :
             var c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline);
             return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: c$7
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "Before",
+                    _0: c$7
+                  }),
+              kind
+            ];
         case "Start" :
             return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "After",
+                    _0: Re_automata_Category.search_boundary
+                  }),
+              kind
+            ];
         case "Stop" :
             return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
+              mk_expr(ids, {
+                    TAG: "Before",
+                    _0: Re_automata_Category.search_boundary
+                  }),
+              kind
+            ];
         
       }
     } else {
       switch (x.TAG) {
         case "Set" :
             return [
-                    cst(ids, trans_set(cache, c, x._0)),
-                    kind
-                  ];
+              cst(ids, trans_set(cache, c, x._0)),
+              kind
+            ];
         case "Sequence" :
             return [
-                    trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0),
-                    kind
-                  ];
+              trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0),
+              kind
+            ];
         case "Alternative" :
             var merged_sequences = merge_sequences(x._0);
             if (merged_sequences && !merged_sequences.tl) {
               var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, merged_sequences.hd);
               return [
-                      enforce_kind(ids, kind, match[1], match[0]),
-                      kind
-                    ];
+                enforce_kind(ids, kind, match[1], match[0]),
+                kind
+              ];
             }
             return [
-                    alt(ids, List.map((function(ign_group,greedy){
-                            return function (r$p) {
-                              var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
-                              return enforce_kind(ids, kind, match[1], match[0]);
-                            }
-                            }(ign_group,greedy)), merged_sequences)),
-                    kind
-                  ];
+              alt(ids, List.map((function(ign_group,greedy){
+                      return function (r$p) {
+                        var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
+                        return enforce_kind(ids, kind, match[1], match[0]);
+                      }
+                      }(ign_group,greedy)), merged_sequences)),
+              kind
+            ];
         case "Repeat" :
             var j = x._2;
             var i = x._1;
@@ -2433,22 +2433,22 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
               var f = greedy === "Non_greedy" ? (function(cr,kind$p){
                 return function (rem) {
                   return alt(ids, {
-                              hd: mk_expr(ids, "Eps"),
-                              tl: {
-                                hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                                tl: /* [] */0
-                              }
-                            });
+                        hd: mk_expr(ids, "Eps"),
+                        tl: {
+                          hd: seq$1(ids, kind$p, rename(ids, cr), rem),
+                          tl: /* [] */0
+                        }
+                      });
                 }
                 }(cr,kind$p)) : (function(cr,kind$p){
                 return function (rem) {
                   return alt(ids, {
-                              hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                              tl: {
-                                hd: mk_expr(ids, "Eps"),
-                                tl: /* [] */0
-                              }
-                            });
+                        hd: seq$1(ids, kind$p, rename(ids, cr), rem),
+                        tl: {
+                          hd: mk_expr(ids, "Eps"),
+                          tl: /* [] */0
+                        }
+                      });
                 }
                 }(cr,kind$p));
               rem = iter(j - i | 0, f, mk_expr(ids, "Eps"));
@@ -2456,20 +2456,20 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
               rem = rep(ids, greedy, kind$p, cr);
             }
             return [
-                    iter(i, (function(cr,kind$p){
-                        return function (rem) {
-                          return seq$1(ids, kind$p, rename(ids, cr), rem);
-                        }
-                        }(cr,kind$p)), rem),
-                    kind
-                  ];
+              iter(i, (function(cr,kind$p){
+                  return function (rem) {
+                    return seq$1(ids, kind$p, rename(ids, cr), rem);
+                  }
+                  }(cr,kind$p)), rem),
+              kind
+            ];
         case "Sem" :
             var kind$p$1 = x._0;
             var match$2 = translate(ids, kind$p$1, ign_group, ign_case, greedy, pos, cache, c, x._1);
             return [
-                    enforce_kind(ids, kind$p$1, match$2[1], match$2[0]),
-                    kind$p$1
-                  ];
+              enforce_kind(ids, kind$p$1, match$2[1], match$2[0]),
+              kind$p$1
+            ];
         case "Sem_greedy" :
             _x = x._1;
             _greedy = x._0;
@@ -2484,15 +2484,15 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
             pos.contents = pos.contents + 2 | 0;
             var match$3 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
             return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "Mark",
-                              _0: p
-                            }), seq$1(ids, "First", match$3[0], mk_expr(ids, {
-                                  TAG: "Mark",
-                                  _0: p + 1 | 0
-                                }))),
-                    match$3[1]
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: "Mark",
+                        _0: p
+                      }), seq$1(ids, "First", match$3[0], mk_expr(ids, {
+                            TAG: "Mark",
+                            _0: p + 1 | 0
+                          }))),
+              match$3[1]
+            ];
         case "No_group" :
             _x = x._0;
             _ign_group = true;
@@ -2505,34 +2505,34 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
             var e = pos.contents - 1 | 0;
             if (e < b) {
               return [
-                      cr$1,
-                      kind$p$2
-                    ];
+                cr$1,
+                kind$p$2
+              ];
             } else {
               return [
-                      seq$1(ids, "First", erase(ids, b, e), cr$1),
-                      kind$p$2
-                    ];
+                seq$1(ids, "First", erase(ids, b, e), cr$1),
+                kind$p$2
+              ];
             }
         case "Pmark" :
             var match$5 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._1);
             return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "Pmark",
-                              _0: x._0
-                            }), match$5[0]),
-                    match$5[1]
-                  ];
+              seq$1(ids, "First", mk_expr(ids, {
+                        TAG: "Pmark",
+                        _0: x._0
+                      }), match$5[0]),
+              match$5[1]
+            ];
         default:
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "ocaml_re_test.res",
-                  2403,
-                  80
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "ocaml_re_test.res",
+              2403,
+              80
+            ],
+            Error: new Error()
+          };
       }
     }
   };
@@ -2567,27 +2567,27 @@ function case_insens(s) {
 function as_set(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ocaml_re_test.res",
-            2438,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "ocaml_re_test.res",
+        2438,
+        11
+      ],
+      Error: new Error()
+    };
   }
   if (x.TAG === "Set") {
     return x._0;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "ocaml_re_test.res",
-          2438,
-          11
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "ocaml_re_test.res",
+      2438,
+      11
+    ],
+    Error: new Error()
+  };
 }
 
 function handle_case(_ign_case, _x) {
@@ -2601,18 +2601,18 @@ function handle_case(_ign_case, _x) {
       case "Set" :
           var s = x._0;
           return {
-                  TAG: "Set",
-                  _0: ign_case ? case_insens(s) : s
-                };
+            TAG: "Set",
+            _0: ign_case ? case_insens(s) : s
+          };
       case "Sequence" :
           return {
-                  TAG: "Sequence",
-                  _0: List.map((function(ign_case){
-                      return function (param) {
-                        return handle_case(ign_case, param);
-                      }
-                      }(ign_case)), x._0)
-                };
+            TAG: "Sequence",
+            _0: List.map((function(ign_case){
+                return function (param) {
+                  return handle_case(ign_case, param);
+                }
+                }(ign_case)), x._0)
+          };
       case "Alternative" :
           var l$p = List.map((function(ign_case){
               return function (param) {
@@ -2624,34 +2624,34 @@ function handle_case(_ign_case, _x) {
                   _0: l$p
                 })) {
             return {
-                    TAG: "Set",
-                    _0: List.fold_left((function (s, r) {
-                            return union(s, as_set(r));
-                          }), /* [] */0, l$p)
-                  };
+              TAG: "Set",
+              _0: List.fold_left((function (s, r) {
+                      return union(s, as_set(r));
+                    }), /* [] */0, l$p)
+            };
           } else {
             return {
-                    TAG: "Alternative",
-                    _0: l$p
-                  };
+              TAG: "Alternative",
+              _0: l$p
+            };
           }
       case "Repeat" :
           return {
-                  TAG: "Repeat",
-                  _0: handle_case(ign_case, x._0),
-                  _1: x._1,
-                  _2: x._2
-                };
+            TAG: "Repeat",
+            _0: handle_case(ign_case, x._0),
+            _1: x._1,
+            _2: x._2
+          };
       case "Sem" :
           var r$p = handle_case(ign_case, x._1);
           if (is_charset(r$p)) {
             return r$p;
           } else {
             return {
-                    TAG: "Sem",
-                    _0: x._0,
-                    _1: r$p
-                  };
+              TAG: "Sem",
+              _0: x._0,
+              _1: r$p
+            };
           }
       case "Sem_greedy" :
           var r$p$1 = handle_case(ign_case, x._1);
@@ -2659,25 +2659,25 @@ function handle_case(_ign_case, _x) {
             return r$p$1;
           } else {
             return {
-                    TAG: "Sem_greedy",
-                    _0: x._0,
-                    _1: r$p$1
-                  };
+              TAG: "Sem_greedy",
+              _0: x._0,
+              _1: r$p$1
+            };
           }
       case "Group" :
           return {
-                  TAG: "Group",
-                  _0: handle_case(ign_case, x._0)
-                };
+            TAG: "Group",
+            _0: handle_case(ign_case, x._0)
+          };
       case "No_group" :
           var r$p$2 = handle_case(ign_case, x._0);
           if (is_charset(r$p$2)) {
             return r$p$2;
           } else {
             return {
-                    TAG: "No_group",
-                    _0: r$p$2
-                  };
+              TAG: "No_group",
+              _0: r$p$2
+            };
           }
       case "Nest" :
           var r$p$3 = handle_case(ign_case, x._0);
@@ -2685,9 +2685,9 @@ function handle_case(_ign_case, _x) {
             return r$p$3;
           } else {
             return {
-                    TAG: "Nest",
-                    _0: r$p$3
-                  };
+              TAG: "Nest",
+              _0: r$p$3
+            };
           }
       case "Case" :
           _x = x._0;
@@ -2704,11 +2704,11 @@ function handle_case(_ign_case, _x) {
               }
               }(ign_case)), x._0);
           return {
-                  TAG: "Set",
-                  _0: List.fold_left((function (s, r) {
-                          return inter(s, as_set(r));
-                        }), cany, l$p$1)
-                };
+            TAG: "Set",
+            _0: List.fold_left((function (s, r) {
+                    return inter(s, as_set(r));
+                  }), cany, l$p$1)
+          };
       case "Complement" :
           var l$p$2 = List.map((function(ign_case){
               return function (r) {
@@ -2716,22 +2716,22 @@ function handle_case(_ign_case, _x) {
               }
               }(ign_case)), x._0);
           return {
-                  TAG: "Set",
-                  _0: diff(cany, List.fold_left((function (s, r) {
-                              return union(s, as_set(r));
-                            }), /* [] */0, l$p$2))
-                };
+            TAG: "Set",
+            _0: diff(cany, List.fold_left((function (s, r) {
+                        return union(s, as_set(r));
+                      }), /* [] */0, l$p$2))
+          };
       case "Difference" :
           return {
-                  TAG: "Set",
-                  _0: inter(as_set(handle_case(ign_case, x._0)), diff(cany, as_set(handle_case(ign_case, x._1))))
-                };
+            TAG: "Set",
+            _0: inter(as_set(handle_case(ign_case, x._0)), diff(cany, as_set(handle_case(ign_case, x._1))))
+          };
       case "Pmark" :
           return {
-                  TAG: "Pmark",
-                  _0: x._0,
-                  _1: handle_case(ign_case, x._1)
-                };
+            TAG: "Pmark",
+            _0: x._0,
+            _1: handle_case(ign_case, x._1)
+          };
       
     }
   };
@@ -2784,9 +2784,9 @@ function alt$1(x) {
     return x.hd;
   } else {
     return {
-            TAG: "Alternative",
-            _0: x
-          };
+      TAG: "Alternative",
+      _0: x
+    };
   }
 }
 
@@ -2795,9 +2795,9 @@ function seq$2(x) {
     return x.hd;
   } else {
     return {
-            TAG: "Sequence",
-            _0: x
-          };
+      TAG: "Sequence",
+      _0: x
+    };
   }
 }
 
@@ -2809,24 +2809,24 @@ var epsilon = {
 function repn(r, i, j) {
   if (i < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Re.repn",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Re.repn",
+      Error: new Error()
+    };
   }
   if (j !== undefined && j < i) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Re.repn",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Re.repn",
+      Error: new Error()
+    };
   }
   return {
-          TAG: "Repeat",
-          _0: r,
-          _1: i,
-          _2: j
-        };
+    TAG: "Repeat",
+    _0: r,
+    _1: i,
+    _2: j
+  };
 }
 
 function set(str) {
@@ -2835,9 +2835,9 @@ function set(str) {
     s = union(single(Caml_string.get(str, i)), s);
   }
   return {
-          TAG: "Set",
-          _0: s
-        };
+    TAG: "Set",
+    _0: s
+  };
 }
 
 function compl(l) {
@@ -2849,10 +2849,10 @@ function compl(l) {
     return r;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Re.compl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Re.compl",
+    Error: new Error()
+  };
 }
 
 var any = {
@@ -3147,9 +3147,9 @@ var xdigit = alt$1({
 
 function compile(r) {
   var regexp = anchored(r) ? ({
-        TAG: "Group",
-        _0: r
-      }) : seq$2({
+      TAG: "Group",
+      _0: r
+    }) : seq$2({
           hd: {
             TAG: "Sem",
             _0: "Shortest",
@@ -3184,18 +3184,18 @@ function compile(r) {
   var col_repr = match[1];
   var group_count = pos.contents / 2 | 0;
   return {
-          initial: r$1,
-          initial_states: /* [] */0,
-          cols: col,
-          col_repr: col_repr,
-          ncol: ncol$1,
-          lnl: lnl,
-          tbl: {
-            contents: [false]
-          },
-          states: Curry._1(Re_automata_State.Table.create, 97),
-          group_count: group_count
-        };
+    initial: r$1,
+    initial_states: /* [] */0,
+    cols: col,
+    col_repr: col_repr,
+    ncol: ncol$1,
+    lnl: lnl,
+    tbl: {
+      contents: [false]
+    },
+    states: Curry._1(Re_automata_State.Table.create, 97),
+    group_count: group_count
+  };
 }
 
 function exec_internal(name, posOpt, lenOpt, groups, re, s) {
@@ -3203,10 +3203,10 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) {
   var len = lenOpt !== undefined ? lenOpt : -1;
   if (pos < 0 || len < -1 || (pos + len | 0) > s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: name,
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: name,
+      Error: new Error()
+    };
   }
   var partial = false;
   var slen = s.length;
@@ -3258,38 +3258,38 @@ function exec_internal(name, posOpt, lenOpt, groups, re, s) {
     }
   } else {
     return {
-            TAG: "Match",
-            _0: {
-              s: s,
-              marks: res._0,
-              pmarks: res._1,
-              gpos: info.positions,
-              gcount: re.group_count
-            }
-          };
+      TAG: "Match",
+      _0: {
+        s: s,
+        marks: res._0,
+        pmarks: res._1,
+        gpos: info.positions,
+        gcount: re.group_count
+      }
+    };
   }
 }
 
 function offset$1(t, i) {
   if (((i << 1) + 1 | 0) >= t.marks.length) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var m1 = Caml_array.get(t.marks, (i << 1));
   if (m1 === -1) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var p1 = Caml_array.get(t.gpos, m1) - 1 | 0;
   var p2 = Caml_array.get(t.gpos, Caml_array.get(t.marks, (i << 1) + 1 | 0)) - 1 | 0;
   return [
-          p1,
-          p2
-        ];
+    p1,
+    p2
+  ];
 }
 
 function get(t, i) {
@@ -3333,10 +3333,10 @@ function posix_class_of_string(x) {
     default:
       var s = "Invalid pcre class: " + x;
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: s,
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: s,
+        Error: new Error()
+      };
   }
 }
 
@@ -3366,17 +3366,17 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         try {
           if (Caml_string.get(s$p, j) !== Caml_string.get(s, i.contents + j | 0)) {
             throw {
-                  RE_EXN_ID: Pervasives.Exit,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Pervasives.Exit,
+              Error: new Error()
+            };
           }
           
         }
         catch (exn){
           throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
+            RE_EXN_ID: Pervasives.Exit,
+            Error: new Error()
+          };
         }
       }
       i.contents = i.contents + len | 0;
@@ -3400,16 +3400,16 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
     var gr$1 = ungreedy ? !gr : gr;
     if (gr$1) {
       return {
-              TAG: "Sem_greedy",
-              _0: "Non_greedy",
-              _1: r
-            };
+        TAG: "Sem_greedy",
+        _0: "Non_greedy",
+        _1: r
+      };
     } else {
       return {
-              TAG: "Sem_greedy",
-              _0: "Greedy",
-              _1: r
-            };
+        TAG: "Sem_greedy",
+        _0: "Greedy",
+        _1: r
+      };
     }
   };
   var atom = function (param) {
@@ -3426,9 +3426,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           var r = regexp$p(branch$p(/* [] */0));
           if (!accept(/* ')' */41)) {
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
           }
           return r;
         }
@@ -3444,21 +3444,21 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           };
         }
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       var r$1 = regexp$p(branch$p(/* [] */0));
       if (!accept(/* ')' */41)) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       return {
-              TAG: "Group",
-              _0: r$1
-            };
+        TAG: "Group",
+        _0: r$1
+      };
     }
     if (accept(/* '^' */94)) {
       if (multiline) {
@@ -3486,9 +3486,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
     if (accept(/* '\\' */92)) {
       if (i.contents === l) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       var c = get();
       switch (c) {
@@ -3503,73 +3503,73 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 56 :
         case 57 :
             throw {
-                  RE_EXN_ID: Not_supported,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Not_supported,
+              Error: new Error()
+            };
         case 65 :
             return "Beg_of_str";
         case 66 :
             return "Not_bound";
         case 68 :
             return compl({
-                        hd: digit,
-                        tl: /* [] */0
-                      });
+                  hd: digit,
+                  tl: /* [] */0
+                });
         case 71 :
             return "Start";
         case 83 :
             return compl({
-                        hd: space,
-                        tl: /* [] */0
-                      });
+                  hd: space,
+                  tl: /* [] */0
+                });
         case 87 :
             return compl({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: "Set",
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: alnum,
+                  tl: {
+                    hd: {
+                      TAG: "Set",
+                      _0: {
+                        hd: [
+                          /* '_' */95,
+                          /* '_' */95
+                        ],
+                        tl: /* [] */0
+                      }
+                    },
+                    tl: /* [] */0
+                  }
+                });
         case 90 :
             return "Last_end_of_line";
         case 98 :
             return alt$1({
-                        hd: "Beg_of_word",
-                        tl: {
-                          hd: "End_of_word",
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: "Beg_of_word",
+                  tl: {
+                    hd: "End_of_word",
+                    tl: /* [] */0
+                  }
+                });
         case 100 :
             return digit;
         case 115 :
             return space;
         case 119 :
             return alt$1({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: "Set",
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
+                  hd: alnum,
+                  tl: {
+                    hd: {
+                      TAG: "Set",
+                      _0: {
+                        hd: [
+                          /* '_' */95,
+                          /* '_' */95
+                        ],
+                        tl: /* [] */0
+                      }
+                    },
+                    tl: /* [] */0
+                  }
+                });
         case 67 :
         case 69 :
         case 70 :
@@ -3611,65 +3611,65 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 120 :
         case 121 :
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
         case 122 :
             return "End_of_str";
         default:
           return {
-                  TAG: "Set",
-                  _0: single(c)
-                };
+            TAG: "Set",
+            _0: single(c)
+          };
       }
     } else {
       if (i.contents === l) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       var c$1 = get();
       if (c$1 >= 64) {
         if (c$1 !== 92) {
           if (c$1 !== 123) {
             return {
-                    TAG: "Set",
-                    _0: single(c$1)
-                  };
+              TAG: "Set",
+              _0: single(c$1)
+            };
           }
           throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            Error: new Error()
+          };
         }
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       if (c$1 >= 44) {
         if (c$1 >= 63) {
           throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            Error: new Error()
+          };
         }
         return {
-                TAG: "Set",
-                _0: single(c$1)
-              };
+          TAG: "Set",
+          _0: single(c$1)
+        };
       }
       if (c$1 >= 42) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       return {
-              TAG: "Set",
-              _0: single(c$1)
-            };
+        TAG: "Set",
+        _0: single(c$1)
+      };
     }
   };
   var integer = function (param) {
@@ -3695,9 +3695,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         var i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0;
         if (i$p < i$1) {
           throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            Error: new Error()
+          };
         }
         _i = i$p;
         continue ;
@@ -3707,17 +3707,17 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
   var $$char = function (param) {
     if (i.contents === l) {
       throw {
-            RE_EXN_ID: Parse_error,
-            Error: new Error()
-          };
+        RE_EXN_ID: Parse_error,
+        Error: new Error()
+      };
     }
     var c = get();
     if (c === /* '[' */91) {
       if (accept(/* '=' */61)) {
         throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
+          RE_EXN_ID: Not_supported,
+          Error: new Error()
+        };
       }
       if (accept(/* ':' */58)) {
         var compl$1 = accept(/* '^' */94);
@@ -3768,17 +3768,17 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
           var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
           if (exn.RE_EXN_ID === "Not_found") {
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
           }
           throw exn;
         }
         if (!accept_s(":]")) {
           throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            Error: new Error()
+          };
         }
         var posix_class = posix_class_of_string(cls);
         var re = compl$1 ? compl({
@@ -3786,91 +3786,91 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
                 tl: /* [] */0
               }) : posix_class;
         return {
-                NAME: "Set",
-                VAL: re
-              };
+          NAME: "Set",
+          VAL: re
+        };
       }
       if (!accept(/* '.' */46)) {
         return {
-                NAME: "Char",
-                VAL: c
-              };
+          NAME: "Char",
+          VAL: c
+        };
       }
       if (i.contents === l) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       var c$1 = get();
       if (!accept(/* '.' */46)) {
         throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
+          RE_EXN_ID: Not_supported,
+          Error: new Error()
+        };
       }
       if (!accept(/* ']' */93)) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       return {
-              NAME: "Char",
-              VAL: c$1
-            };
+        NAME: "Char",
+        VAL: c$1
+      };
     }
     if (c !== /* '\\' */92) {
       return {
-              NAME: "Char",
-              VAL: c
-            };
+        NAME: "Char",
+        VAL: c
+      };
     }
     var c$2 = get();
     if (c$2 >= 58) {
       if (c$2 >= 123) {
         return {
-                NAME: "Char",
-                VAL: c$2
-              };
+          NAME: "Char",
+          VAL: c$2
+        };
       }
       switch (c$2) {
         case 68 :
             return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: digit,
-                          tl: /* [] */0
-                        })
-                  };
+              NAME: "Set",
+              VAL: compl({
+                    hd: digit,
+                    tl: /* [] */0
+                  })
+            };
         case 83 :
             return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: space,
-                          tl: /* [] */0
-                        })
-                  };
+              NAME: "Set",
+              VAL: compl({
+                    hd: space,
+                    tl: /* [] */0
+                  })
+            };
         case 87 :
             return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: alnum,
-                          tl: {
-                            hd: {
-                              TAG: "Set",
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
+              NAME: "Set",
+              VAL: compl({
+                    hd: alnum,
+                    tl: {
+                      hd: {
+                        TAG: "Set",
+                        _0: {
+                          hd: [
+                            /* '_' */95,
+                            /* '_' */95
+                          ],
+                          tl: /* [] */0
+                        }
+                      },
+                      tl: /* [] */0
+                    }
+                  })
+            };
         case 58 :
         case 59 :
         case 60 :
@@ -3885,59 +3885,59 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 95 :
         case 96 :
             return {
-                    NAME: "Char",
-                    VAL: c$2
-                  };
+              NAME: "Char",
+              VAL: c$2
+            };
         case 98 :
             return {
-                    NAME: "Char",
-                    VAL: /* '\b' */8
-                  };
+              NAME: "Char",
+              VAL: /* '\b' */8
+            };
         case 100 :
             return {
-                    NAME: "Set",
-                    VAL: digit
-                  };
+              NAME: "Set",
+              VAL: digit
+            };
         case 110 :
             return {
-                    NAME: "Char",
-                    VAL: /* '\n' */10
-                  };
+              NAME: "Char",
+              VAL: /* '\n' */10
+            };
         case 114 :
             return {
-                    NAME: "Char",
-                    VAL: /* '\r' */13
-                  };
+              NAME: "Char",
+              VAL: /* '\r' */13
+            };
         case 115 :
             return {
-                    NAME: "Set",
-                    VAL: space
-                  };
+              NAME: "Set",
+              VAL: space
+            };
         case 116 :
             return {
-                    NAME: "Char",
-                    VAL: /* '\t' */9
-                  };
+              NAME: "Char",
+              VAL: /* '\t' */9
+            };
         case 119 :
             return {
-                    NAME: "Set",
-                    VAL: alt$1({
-                          hd: alnum,
-                          tl: {
-                            hd: {
-                              TAG: "Set",
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
+              NAME: "Set",
+              VAL: alt$1({
+                    hd: alnum,
+                    tl: {
+                      hd: {
+                        TAG: "Set",
+                        _0: {
+                          hd: [
+                            /* '_' */95,
+                            /* '_' */95
+                          ],
+                          tl: /* [] */0
+                        }
+                      },
+                      tl: /* [] */0
+                    }
+                  })
+            };
         case 65 :
         case 66 :
         case 67 :
@@ -3981,22 +3981,22 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         case 121 :
         case 122 :
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
         
       }
     } else {
       if (c$2 >= 48) {
         throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
+          RE_EXN_ID: Not_supported,
+          Error: new Error()
+        };
       }
       return {
-              NAME: "Char",
-              VAL: c$2
-            };
+        NAME: "Char",
+        VAL: c$2
+      };
     }
   };
   var bracket = function (_s) {
@@ -4011,49 +4011,49 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
         if (accept(/* '-' */45)) {
           if (accept(/* ']' */93)) {
             return {
-                    hd: {
-                      TAG: "Set",
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Set",
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: s
-                    }
-                  };
+              hd: {
+                TAG: "Set",
+                _0: single(c)
+              },
+              tl: {
+                hd: {
+                  TAG: "Set",
+                  _0: {
+                    hd: [
+                      /* '-' */45,
+                      /* '-' */45
+                    ],
+                    tl: /* [] */0
+                  }
+                },
+                tl: s
+              }
+            };
           }
           var match$1 = $$char();
           if (match$1.NAME !== "Char") {
             return {
-                    hd: {
-                      TAG: "Set",
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Set",
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: {
-                        hd: match$1.VAL,
-                        tl: s
-                      }
-                    }
-                  };
+              hd: {
+                TAG: "Set",
+                _0: single(c)
+              },
+              tl: {
+                hd: {
+                  TAG: "Set",
+                  _0: {
+                    hd: [
+                      /* '-' */45,
+                      /* '-' */45
+                    ],
+                    tl: /* [] */0
+                  }
+                },
+                tl: {
+                  hd: match$1.VAL,
+                  tl: s
+                }
+              }
+            };
           }
           _s = {
             hd: {
@@ -4099,15 +4099,15 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
       var j = accept(/* ',' */44) ? integer() : i$1;
       if (!accept(/* '}' */125)) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       if (j !== undefined && j < i$1) {
         throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          Error: new Error()
+        };
       }
       return greedy_mod(repn(r, i$1, j));
     }
@@ -4146,9 +4146,9 @@ function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
   var res = regexp$p(branch$p(/* [] */0));
   if (i.contents !== l) {
     throw {
-          RE_EXN_ID: Parse_error,
-          Error: new Error()
-        };
+      RE_EXN_ID: Parse_error,
+      Error: new Error()
+    };
   }
   return res;
 }
@@ -4176,9 +4176,9 @@ function re(flagsOpt, pat) {
         }) : r;
   if (List.memq("Caseless", opts$1)) {
     return {
-            TAG: "No_case",
-            _0: r$1
-          };
+      TAG: "No_case",
+      _0: r$1
+    };
   } else {
     return r$1;
   }
@@ -4192,14 +4192,14 @@ function exec(rex, pos, s) {
   }
   if (substr === "Failed") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var s = "a".repeat(1048575) + "b";
diff --git a/jscomp/test/of_string_test.js b/jscomp/test/of_string_test.js
index a8cc4218c84..b8f15cc3517 100644
--- a/jscomp/test/of_string_test.js
+++ b/jscomp/test/of_string_test.js
@@ -8,10 +8,10 @@ var suites_0 = [
   "string_of_float_1",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: "10.",
-              _1: Pervasives.string_of_float(10)
-            };
+        TAG: "Eq",
+        _0: "10.",
+        _1: Pervasives.string_of_float(10)
+      };
     })
 ];
 
@@ -20,10 +20,10 @@ var suites_1 = {
     "string_of_int",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: "10",
-                _1: String(10)
-              };
+          TAG: "Eq",
+          _0: "10",
+          _1: String(10)
+        };
       })
   ],
   tl: {
@@ -31,10 +31,10 @@ var suites_1 = {
       "valid_float_lexem",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: "10.",
-                  _1: Pervasives.valid_float_lexem("10")
-                };
+            TAG: "Eq",
+            _0: "10.",
+            _1: Pervasives.valid_float_lexem("10")
+          };
         })
     ],
     tl: /* [] */0
diff --git a/jscomp/test/offset.js b/jscomp/test/offset.js
index 06e157d58ad..d06487eed2e 100644
--- a/jscomp/test/offset.js
+++ b/jscomp/test/offset.js
@@ -21,12 +21,12 @@ function create(l, v, r) {
   var hr;
   hr = typeof r !== "object" ? 0 : r.h;
   return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -37,10 +37,10 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var lv = l.v;
@@ -52,26 +52,26 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rv = r.v;
@@ -83,21 +83,21 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Set.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var v = param.v;
@@ -124,12 +124,12 @@ function add(x, param) {
 
 function singleton(x) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -171,9 +171,9 @@ function min_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -204,9 +204,9 @@ function max_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
@@ -235,10 +235,10 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -261,10 +261,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            false,
-            "Empty"
-          ];
+      "Empty",
+      false,
+      "Empty"
+    ];
   }
   var r = param.r;
   var v = param.v;
@@ -272,25 +272,25 @@ function split(x, param) {
   var c = Caml.string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function is_empty(param) {
@@ -595,9 +595,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var v = param.v;
   var match = partition(p, param.l);
@@ -609,14 +609,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pv) {
     return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, rf)
+    ];
   }
 }
 
@@ -653,9 +653,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     var c = Caml.string_compare(x, v);
@@ -672,9 +672,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -737,9 +737,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -860,21 +860,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      "Empty",
-                      l
-                    ];
+                "Empty",
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    l: "Empty",
+                    v: l.hd,
+                    r: "Empty",
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -882,21 +882,21 @@ function of_list(l) {
                 var match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: l.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: "Empty",
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -908,27 +908,27 @@ function of_list(l) {
                   var match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: match$2.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -944,19 +944,19 @@ function of_list(l) {
         if (l$1) {
           var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
           return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
+            create(match$3[0], l$1.hd, match$4[0]),
+            match$4[1]
+          ];
         }
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "set.res",
+            691,
+            20
+          ],
+          Error: new Error()
+        };
       };
       return sub(List.length(l$1), l$1)[0];
     } else {
diff --git a/jscomp/test/option_repr_test.js b/jscomp/test/option_repr_test.js
index a9cf2b9eb81..e74487f0713 100644
--- a/jscomp/test/option_repr_test.js
+++ b/jscomp/test/option_repr_test.js
@@ -114,15 +114,15 @@ var length_10_id = Belt_List.makeBy(10, (function (x) {
 
 function f13$1(param) {
   return Caml_obj.equal(Belt_List.take(length_10_id, 8), {
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: /* [] */0
-                }
-              }
-            });
+        hd: 1,
+        tl: {
+          hd: 2,
+          tl: {
+            hd: 3,
+            tl: /* [] */0
+          }
+        }
+      });
 }
 
 b("File \"option_repr_test.res\", line 93, characters 4-11", Caml_obj.lessthan(undefined, null));
@@ -171,8 +171,8 @@ function neqx(a, b) {
 
 function all_true(xs) {
   return Belt_List.every(xs, (function (x) {
-                return x;
-              }));
+          return x;
+        }));
 }
 
 var xs_0 = gtx(Caml_option.some(null), Caml_option.some(undefined));
diff --git a/jscomp/test/optional_ffi_test.js b/jscomp/test/optional_ffi_test.js
index 18ac19b2942..9a838b397df 100644
--- a/jscomp/test/optional_ffi_test.js
+++ b/jscomp/test/optional_ffi_test.js
@@ -21,10 +21,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/pipe_send_readline.js b/jscomp/test/pipe_send_readline.js
index 1186d0a36f0..cd94f7a2c65 100644
--- a/jscomp/test/pipe_send_readline.js
+++ b/jscomp/test/pipe_send_readline.js
@@ -4,10 +4,10 @@
 
 function u(rl) {
   return rl.on("line", (function (x) {
-                  console.log(x);
-                })).on("close", (function () {
-                console.log("finished");
-              }));
+            console.log(x);
+          })).on("close", (function () {
+          console.log("finished");
+        }));
 }
 
 function xx(h) {
diff --git a/jscomp/test/pipe_syntax.js b/jscomp/test/pipe_syntax.js
index 86f6cc54187..867f7cdf868 100644
--- a/jscomp/test/pipe_syntax.js
+++ b/jscomp/test/pipe_syntax.js
@@ -22,17 +22,17 @@ function t3(x, f) {
 
 function f(a, b, c) {
   return [
-          Curry._1(b, a),
-          Curry._1(c, a)
-        ];
+    Curry._1(b, a),
+    Curry._1(c, a)
+  ];
 }
 
 function f1(a, b, c, d) {
   var __ocaml_internal_obj = Curry._1(a, b);
   return [
-          Curry._1(c, __ocaml_internal_obj),
-          Curry._1(d, __ocaml_internal_obj)
-        ];
+    Curry._1(c, __ocaml_internal_obj),
+    Curry._1(d, __ocaml_internal_obj)
+  ];
 }
 
 function f2(a, b, c, d) {
@@ -52,9 +52,9 @@ function f3(a, b, c, d, e) {
 
 function f4(a, b, c) {
   return [
-          Curry._2(b, a, c),
-          Curry._2(b, a, c)
-        ];
+    Curry._2(b, a, c),
+    Curry._2(b, a, c)
+  ];
 }
 
 function f5(a, b, c, d) {
@@ -70,10 +70,10 @@ function f6(a) {
 
 function f7(a) {
   return [
-          Caml_option.some(a),
-          Caml_option.some(a),
-          Caml_option.some(a)
-        ];
+    Caml_option.some(a),
+    Caml_option.some(a),
+    Caml_option.some(a)
+  ];
 }
 
 function f8(a) {
diff --git a/jscomp/test/poly_variant_test.js b/jscomp/test/poly_variant_test.js
index 33f79cf8ae9..40c63a75a67 100644
--- a/jscomp/test/poly_variant_test.js
+++ b/jscomp/test/poly_variant_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/polymorphic_raw_test.js b/jscomp/test/polymorphic_raw_test.js
index aa029a4e35f..6635dfa3970 100644
--- a/jscomp/test/polymorphic_raw_test.js
+++ b/jscomp/test/polymorphic_raw_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/polymorphism_test.js b/jscomp/test/polymorphism_test.js
index 8fde5552b24..70bd4fe1b16 100644
--- a/jscomp/test/polymorphism_test.js
+++ b/jscomp/test/polymorphism_test.js
@@ -8,9 +8,9 @@ function map(f, x) {
   }
   var r = f(x.hd);
   return {
-          hd: r,
-          tl: map(f, x.tl)
-        };
+    hd: r,
+    tl: map(f, x.tl)
+  };
 }
 
 exports.map = map;
diff --git a/jscomp/test/ppx_apply_test.js b/jscomp/test/ppx_apply_test.js
index 6111a80de5c..fa1382d279e 100644
--- a/jscomp/test/ppx_apply_test.js
+++ b/jscomp/test/ppx_apply_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/pq_test.js b/jscomp/test/pq_test.js
index 3fb5083b0b7..ca452691765 100644
--- a/jscomp/test/pq_test.js
+++ b/jscomp/test/pq_test.js
@@ -6,12 +6,12 @@ var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 function insert(queue, prio, elt) {
   if (typeof queue !== "object") {
     return {
-            TAG: "Node",
-            _0: prio,
-            _1: elt,
-            _2: "Empty",
-            _3: "Empty"
-          };
+      TAG: "Node",
+      _0: prio,
+      _1: elt,
+      _2: "Empty",
+      _3: "Empty"
+    };
   }
   var right = queue._3;
   var left = queue._2;
@@ -19,20 +19,20 @@ function insert(queue, prio, elt) {
   var p = queue._0;
   if (prio <= p) {
     return {
-            TAG: "Node",
-            _0: prio,
-            _1: elt,
-            _2: insert(right, p, e),
-            _3: left
-          };
+      TAG: "Node",
+      _0: prio,
+      _1: elt,
+      _2: insert(right, p, e),
+      _3: left
+    };
   } else {
     return {
-            TAG: "Node",
-            _0: p,
-            _1: e,
-            _2: insert(right, prio, elt),
-            _3: left
-          };
+      TAG: "Node",
+      _0: p,
+      _1: e,
+      _2: insert(right, prio, elt),
+      _3: left
+    };
   }
 }
 
@@ -41,9 +41,9 @@ var Queue_is_empty = /* @__PURE__ */Caml_exceptions.create("Pq_test.PrioQueue.Qu
 function remove_top(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: Queue_is_empty,
-          Error: new Error()
-        };
+      RE_EXN_ID: Queue_is_empty,
+      Error: new Error()
+    };
   }
   var left = x._2;
   var tmp = x._3;
@@ -58,35 +58,35 @@ function remove_top(x) {
   var lprio = left._0;
   if (lprio <= rprio) {
     return {
-            TAG: "Node",
-            _0: lprio,
-            _1: left._1,
-            _2: remove_top(left),
-            _3: right
-          };
+      TAG: "Node",
+      _0: lprio,
+      _1: left._1,
+      _2: remove_top(left),
+      _3: right
+    };
   } else {
     return {
-            TAG: "Node",
-            _0: rprio,
-            _1: right._1,
-            _2: left,
-            _3: remove_top(right)
-          };
+      TAG: "Node",
+      _0: rprio,
+      _1: right._1,
+      _2: left,
+      _3: remove_top(right)
+    };
   }
 }
 
 function extract(x) {
   if (typeof x === "object") {
     return [
-            x._0,
-            x._1,
-            remove_top(x)
-          ];
+      x._0,
+      x._1,
+      remove_top(x)
+    ];
   }
   throw {
-        RE_EXN_ID: Queue_is_empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Queue_is_empty,
+    Error: new Error()
+  };
 }
 
 var PrioQueue = {
diff --git a/jscomp/test/pr_regression_test.js b/jscomp/test/pr_regression_test.js
index 08eb2e71c01..68e8ad1caae 100644
--- a/jscomp/test/pr_regression_test.js
+++ b/jscomp/test/pr_regression_test.js
@@ -93,20 +93,20 @@ Mt.from_pair_suites("Pr_regression_test", {
         "partial",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: [
-                      5,
-                      5,
-                      5,
-                      5
-                    ],
-                    _1: [
-                      a,
-                      b,
-                      c,
-                      d
-                    ]
-                  };
+              TAG: "Eq",
+              _0: [
+                5,
+                5,
+                5,
+                5
+              ],
+              _1: [
+                a,
+                b,
+                c,
+                d
+              ]
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/print_alpha_test.js b/jscomp/test/print_alpha_test.js
index 0979e727d02..de0ca2755ff 100644
--- a/jscomp/test/print_alpha_test.js
+++ b/jscomp/test/print_alpha_test.js
@@ -14,12 +14,12 @@ Mt.from_pair_suites("Print_alpha_test", {
         "File \"print_alpha_test.res\", line 16, characters 10-17",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: f((function (prim0, prim1) {
-                              return prim0 + prim1 | 0;
-                            }), undefined)(1, 2),
-                    _1: 3
-                  };
+              TAG: "Eq",
+              _0: f((function (prim0, prim1) {
+                        return prim0 + prim1 | 0;
+                      }), undefined)(1, 2),
+              _1: 3
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/queue_402.js b/jscomp/test/queue_402.js
index ab660ef5b86..dc081b0f008 100644
--- a/jscomp/test/queue_402.js
+++ b/jscomp/test/queue_402.js
@@ -9,9 +9,9 @@ var Empty = /* @__PURE__ */Caml_exceptions.create("Queue_402.Empty");
 
 function create(param) {
   return {
-          length: 0,
-          tail: undefined
-        };
+    length: 0,
+    tail: undefined
+  };
 }
 
 function clear(q) {
@@ -42,9 +42,9 @@ function add(x, q) {
 function peek(q) {
   if (q.length === 0) {
     throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
+      RE_EXN_ID: Empty,
+      Error: new Error()
+    };
   }
   return q.tail.next.content;
 }
@@ -52,9 +52,9 @@ function peek(q) {
 function take(q) {
   if (q.length === 0) {
     throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
+      RE_EXN_ID: Empty,
+      Error: new Error()
+    };
   }
   q.length = q.length - 1 | 0;
   var tail = q.tail;
@@ -70,9 +70,9 @@ function take(q) {
 function copy(q) {
   if (q.length === 0) {
     return {
-            length: 0,
-            tail: undefined
-          };
+      length: 0,
+      tail: undefined
+    };
   }
   var tail = q.tail;
   var tail$p = {};
@@ -99,9 +99,9 @@ function copy(q) {
   };
   copy$1(tail$p, tail.next);
   return {
-          length: q.length,
-          tail: tail$p
-        };
+    length: q.length,
+    tail: tail$p
+  };
 }
 
 function is_empty(q) {
diff --git a/jscomp/test/queue_test.js b/jscomp/test/queue_test.js
index 4630a7cb839..5ecc71ebd83 100644
--- a/jscomp/test/queue_test.js
+++ b/jscomp/test/queue_test.js
@@ -25,9 +25,9 @@ function Test(Queue) {
     return to_array(q);
   };
   return {
-          to_array: to_array,
-          queue_1: queue_1
-        };
+    to_array: to_array,
+    queue_1: queue_1
+  };
 }
 
 function to_array(q) {
@@ -91,10 +91,10 @@ var suites_0 = [
         2
       ];
       return {
-              TAG: "Eq",
-              _0: x,
-              _1: queue_1(x)
-            };
+        TAG: "Eq",
+        _0: x,
+        _1: queue_1(x)
+      };
     })
 ];
 
@@ -109,10 +109,10 @@ var suites_1 = {
           2
         ];
         return {
-                TAG: "Eq",
-                _0: x,
-                _1: queue_1$1(x)
-              };
+          TAG: "Eq",
+          _0: x,
+          _1: queue_1$1(x)
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/raw_hash_tbl_bench.js b/jscomp/test/raw_hash_tbl_bench.js
index 6252b105ba9..907084a9acd 100644
--- a/jscomp/test/raw_hash_tbl_bench.js
+++ b/jscomp/test/raw_hash_tbl_bench.js
@@ -11,14 +11,14 @@ function bench(param) {
   for(var i$1 = 0; i$1 <= 1000000; ++i$1){
     if (!Hashtbl.mem(table, i$1)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "raw_hash_tbl_bench.res",
-              8,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "raw_hash_tbl_bench.res",
+          8,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   }
diff --git a/jscomp/test/rbset.js b/jscomp/test/rbset.js
index dc5cbd7aeb3..f22b2a2103d 100644
--- a/jscomp/test/rbset.js
+++ b/jscomp/test/rbset.js
@@ -5,20 +5,20 @@
 function blackify(x) {
   if (typeof x !== "object" || x._0 === "Black") {
     return [
-            x,
-            true
-          ];
+      x,
+      true
+    ];
   } else {
     return [
-            {
-              TAG: "Node",
-              _0: "Black",
-              _1: x._1,
-              _2: x._2,
-              _3: x._3
-            },
-            false
-          ];
+      {
+        TAG: "Node",
+        _0: "Black",
+        _1: x._1,
+        _2: x._2,
+        _3: x._3
+      },
+      false
+    ];
   }
 }
 
@@ -95,32 +95,32 @@ function balance_left(l, x, r) {
   switch (exit) {
     case 1 :
         return {
-                TAG: "Node",
-                _0: "Black",
-                _1: l,
-                _2: x,
-                _3: r
-              };
+          TAG: "Node",
+          _0: "Black",
+          _1: l,
+          _2: x,
+          _3: r
+        };
     case 2 :
         return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
+          TAG: "Node",
+          _0: "Red",
+          _1: {
+            TAG: "Node",
+            _0: "Black",
+            _1: a,
+            _2: x$1,
+            _3: b
+          },
+          _2: y,
+          _3: {
+            TAG: "Node",
+            _0: "Black",
+            _1: c,
+            _2: z,
+            _3: d
+          }
+        };
     
   }
 }
@@ -171,44 +171,44 @@ function balance_right(l, x, r) {
   switch (exit) {
     case 1 :
         return {
-                TAG: "Node",
-                _0: "Black",
-                _1: l,
-                _2: x,
-                _3: r
-              };
+          TAG: "Node",
+          _0: "Black",
+          _1: l,
+          _2: x,
+          _3: r
+        };
     case 2 :
         return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
+          TAG: "Node",
+          _0: "Red",
+          _1: {
+            TAG: "Node",
+            _0: "Black",
+            _1: a,
+            _2: x$1,
+            _3: b
+          },
+          _2: y,
+          _3: {
+            TAG: "Node",
+            _0: "Black",
+            _1: c,
+            _2: z,
+            _3: d
+          }
+        };
     
   }
 }
 
 function singleton(x) {
   return {
-          TAG: "Node",
-          _0: "Black",
-          _1: "Empty",
-          _2: x,
-          _3: "Empty"
-        };
+    TAG: "Node",
+    _0: "Black",
+    _1: "Empty",
+    _2: x,
+    _3: "Empty"
+  };
 }
 
 function unbalanced_left(x) {
@@ -218,34 +218,34 @@ function unbalanced_left(x) {
       if (typeof match === "object") {
         if (match._0 === "Black") {
           return [
-                  balance_left({
-                        TAG: "Node",
-                        _0: "Red",
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }, x._2, x._3),
-                  true
-                ];
+            balance_left({
+                  TAG: "Node",
+                  _0: "Red",
+                  _1: match._1,
+                  _2: match._2,
+                  _3: match._3
+                }, x._2, x._3),
+            true
+          ];
         }
         var match$1 = match._3;
         if (typeof match$1 === "object" && match$1._0 === "Black") {
           return [
-                  {
+            {
+              TAG: "Node",
+              _0: "Black",
+              _1: match._1,
+              _2: match._2,
+              _3: balance_left({
                     TAG: "Node",
-                    _0: "Black",
-                    _1: match._1,
-                    _2: match._2,
-                    _3: balance_left({
-                          TAG: "Node",
-                          _0: "Red",
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }, x._2, x._3)
-                  },
-                  false
-                ];
+                    _0: "Red",
+                    _1: match$1._1,
+                    _2: match$1._2,
+                    _3: match$1._3
+                  }, x._2, x._3)
+            },
+            false
+          ];
         }
         
       }
@@ -254,28 +254,28 @@ function unbalanced_left(x) {
       var match$2 = x._1;
       if (typeof match$2 === "object" && match$2._0 === "Black") {
         return [
-                balance_left({
-                      TAG: "Node",
-                      _0: "Red",
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }, x._2, x._3),
-                false
-              ];
+          balance_left({
+                TAG: "Node",
+                _0: "Red",
+                _1: match$2._1,
+                _2: match$2._2,
+                _3: match$2._3
+              }, x._2, x._3),
+          false
+        ];
       }
       
     }
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "rbset.res",
-          64,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "rbset.res",
+      64,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function unbalanced_right(x) {
@@ -287,34 +287,34 @@ function unbalanced_right(x) {
       if (typeof match === "object") {
         if (match._0 === "Black") {
           return [
-                  balance_right(a, x$1, {
-                        TAG: "Node",
-                        _0: "Red",
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }),
-                  true
-                ];
+            balance_right(a, x$1, {
+                  TAG: "Node",
+                  _0: "Red",
+                  _1: match._1,
+                  _2: match._2,
+                  _3: match._3
+                }),
+            true
+          ];
         }
         var match$1 = match._1;
         if (typeof match$1 === "object" && match$1._0 === "Black") {
           return [
-                  {
+            {
+              TAG: "Node",
+              _0: "Black",
+              _1: balance_right(a, x$1, {
                     TAG: "Node",
-                    _0: "Black",
-                    _1: balance_right(a, x$1, {
-                          TAG: "Node",
-                          _0: "Red",
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }),
-                    _2: match._2,
-                    _3: match._3
-                  },
-                  false
-                ];
+                    _0: "Red",
+                    _1: match$1._1,
+                    _2: match$1._2,
+                    _3: match$1._3
+                  }),
+              _2: match._2,
+              _3: match._3
+            },
+            false
+          ];
         }
         
       }
@@ -323,110 +323,110 @@ function unbalanced_right(x) {
       var match$2 = x._3;
       if (typeof match$2 === "object" && match$2._0 === "Black") {
         return [
-                balance_right(x._1, x._2, {
-                      TAG: "Node",
-                      _0: "Red",
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }),
-                false
-              ];
+          balance_right(x._1, x._2, {
+                TAG: "Node",
+                _0: "Red",
+                _1: match$2._1,
+                _2: match$2._2,
+                _3: match$2._3
+              }),
+          false
+        ];
       }
       
     }
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "rbset.res",
-          75,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "rbset.res",
+      75,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function lbalance(x1, x2, x3) {
   if (typeof x1 !== "object") {
     return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: "Node",
+      _0: "Black",
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   if (x1._0 === "Black") {
     return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: "Node",
+      _0: "Black",
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   var r = x1._3;
   var l = x1._1;
   if (typeof l === "object" && l._0 !== "Black") {
     return {
-            TAG: "Node",
-            _0: "Red",
-            _1: {
-              TAG: "Node",
-              _0: "Black",
-              _1: l._1,
-              _2: l._2,
-              _3: l._3
-            },
-            _2: x1._2,
-            _3: {
-              TAG: "Node",
-              _0: "Black",
-              _1: r,
-              _2: x2,
-              _3: x3
-            }
-          };
+      TAG: "Node",
+      _0: "Red",
+      _1: {
+        TAG: "Node",
+        _0: "Black",
+        _1: l._1,
+        _2: l._2,
+        _3: l._3
+      },
+      _2: x1._2,
+      _3: {
+        TAG: "Node",
+        _0: "Black",
+        _1: r,
+        _2: x2,
+        _3: x3
+      }
+    };
   }
   if (typeof r !== "object") {
     return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: "Node",
+      _0: "Black",
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   if (r._0 === "Black") {
     return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
+      TAG: "Node",
+      _0: "Black",
+      _1: x1,
+      _2: x2,
+      _3: x3
+    };
   }
   var y = r._2;
   return {
-          TAG: "Node",
-          _0: "Red",
-          _1: {
-            TAG: "Node",
-            _0: "Black",
-            _1: l,
-            _2: y,
-            _3: r._1
-          },
-          _2: y,
-          _3: {
-            TAG: "Node",
-            _0: "Black",
-            _1: r._3,
-            _2: x2,
-            _3: x3
-          }
-        };
+    TAG: "Node",
+    _0: "Red",
+    _1: {
+      TAG: "Node",
+      _0: "Black",
+      _1: l,
+      _2: y,
+      _3: r._1
+    },
+    _2: y,
+    _3: {
+      TAG: "Node",
+      _0: "Black",
+      _1: r._3,
+      _2: x2,
+      _3: x3
+    }
+  };
 }
 
 function rbalance(x1, x2, x3) {
@@ -438,24 +438,24 @@ function rbalance(x1, x2, x3) {
     } else {
       if (b._0 !== "Black") {
         return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: x1,
-                  _2: x2,
-                  _3: b._1
-                },
-                _2: b._2,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: b._3,
-                  _2: x3._2,
-                  _3: x3._3
-                }
-              };
+          TAG: "Node",
+          _0: "Red",
+          _1: {
+            TAG: "Node",
+            _0: "Black",
+            _1: x1,
+            _2: x2,
+            _3: b._1
+          },
+          _2: b._2,
+          _3: {
+            TAG: "Node",
+            _0: "Black",
+            _1: b._3,
+            _2: x3._2,
+            _3: x3._3
+          }
+        };
       }
       exit = 2;
     }
@@ -463,47 +463,47 @@ function rbalance(x1, x2, x3) {
       var match = x3._3;
       if (typeof match === "object" && match._0 !== "Black") {
         return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: x1,
-                  _2: x2,
-                  _3: b
-                },
-                _2: x3._2,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                }
-              };
+          TAG: "Node",
+          _0: "Red",
+          _1: {
+            TAG: "Node",
+            _0: "Black",
+            _1: x1,
+            _2: x2,
+            _3: b
+          },
+          _2: x3._2,
+          _3: {
+            TAG: "Node",
+            _0: "Black",
+            _1: match._1,
+            _2: match._2,
+            _3: match._3
+          }
+        };
       }
       
     }
     
   }
   return {
-          TAG: "Node",
-          _0: "Black",
-          _1: x1,
-          _2: x2,
-          _3: x3
-        };
+    TAG: "Node",
+    _0: "Black",
+    _1: x1,
+    _2: x2,
+    _3: x3
+  };
 }
 
 function ins(x, x_) {
   if (typeof x_ !== "object") {
     return {
-            TAG: "Node",
-            _0: "Red",
-            _1: "Empty",
-            _2: x,
-            _3: "Empty"
-          };
+      TAG: "Node",
+      _0: "Red",
+      _1: "Empty",
+      _2: x,
+      _3: "Empty"
+    };
   }
   if (x_._0 === "Black") {
     var y = x_._2;
@@ -526,20 +526,20 @@ function ins(x, x_) {
   var a$1 = x_._1;
   if (x < y$1) {
     return {
-            TAG: "Node",
-            _0: "Red",
-            _1: ins(x, a$1),
-            _2: y$1,
-            _3: b$1
-          };
+      TAG: "Node",
+      _0: "Red",
+      _1: ins(x, a$1),
+      _2: y$1,
+      _3: b$1
+    };
   } else {
     return {
-            TAG: "Node",
-            _0: "Red",
-            _1: a$1,
-            _2: y$1,
-            _3: ins(x, b$1)
-          };
+      TAG: "Node",
+      _0: "Red",
+      _1: a$1,
+      _2: y$1,
+      _3: ins(x, b$1)
+    };
   }
 }
 
@@ -549,26 +549,26 @@ function add(x, s) {
     return s$1;
   } else {
     return {
-            TAG: "Node",
-            _0: "Black",
-            _1: s$1._1,
-            _2: s$1._2,
-            _3: s$1._3
-          };
+      TAG: "Node",
+      _0: "Black",
+      _1: s$1._1,
+      _2: s$1._2,
+      _3: s$1._3
+    };
   }
 }
 
 function remove_min(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "rbset.res",
-            138,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "rbset.res",
+        138,
+        4
+      ],
+      Error: new Error()
+    };
   }
   var c = x._0;
   if (c === "Black") {
@@ -578,43 +578,43 @@ function remove_min(x) {
       var x$1 = x._2;
       if (typeof match !== "object") {
         return [
-                "Empty",
-                x$1,
-                true
-              ];
+          "Empty",
+          x$1,
+          true
+        ];
       }
       if (match._0 !== "Black") {
         return [
-                {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                },
-                x$1,
-                false
-              ];
+          {
+            TAG: "Node",
+            _0: "Black",
+            _1: match._1,
+            _2: match._2,
+            _3: match._3
+          },
+          x$1,
+          false
+        ];
       }
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "rbset.res",
-              138,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "rbset.res",
+          138,
+          4
+        ],
+        Error: new Error()
+      };
     }
     
   } else {
     var tmp$1 = x._1;
     if (typeof tmp$1 !== "object") {
       return [
-              x._3,
-              x._2,
-              false
-            ];
+        x._3,
+        x._2,
+        false
+      ];
     }
     
   }
@@ -632,25 +632,25 @@ function remove_min(x) {
   };
   if (!match$1[2]) {
     return [
-            s,
-            y,
-            false
-          ];
+      s,
+      y,
+      false
+    ];
   }
   var match$2 = unbalanced_right(s);
   return [
-          match$2[0],
-          y,
-          match$2[1]
-        ];
+    match$2[0],
+    y,
+    match$2[1]
+  ];
 }
 
 function remove_aux(x, n) {
   if (typeof n !== "object") {
     return [
-            "Empty",
-            false
-          ];
+      "Empty",
+      false
+    ];
   }
   var r = n._3;
   var y = n._2;
@@ -660,9 +660,9 @@ function remove_aux(x, n) {
     if (typeof r !== "object") {
       if (c === "Red") {
         return [
-                l,
-                false
-              ];
+          l,
+          false
+        ];
       } else {
         return blackify(l);
       }
@@ -681,9 +681,9 @@ function remove_aux(x, n) {
       return unbalanced_left(n$1);
     } else {
       return [
-              n$1,
-              false
-            ];
+        n$1,
+        false
+      ];
     }
   }
   if (x < y) {
@@ -700,9 +700,9 @@ function remove_aux(x, n) {
       return unbalanced_right(n$2);
     } else {
       return [
-              n$2,
-              false
-            ];
+        n$2,
+        false
+      ];
     }
   }
   var match$2 = remove_aux(x, r);
@@ -718,9 +718,9 @@ function remove_aux(x, n) {
     return unbalanced_left(n$3);
   } else {
     return [
-            n$3,
-            false
-          ];
+      n$3,
+      false
+    ];
   }
 }
 
diff --git a/jscomp/test/reactDOMRe.js b/jscomp/test/reactDOMRe.js
index a9c0ad6f791..c8eed6108ce 100644
--- a/jscomp/test/reactDOMRe.js
+++ b/jscomp/test/reactDOMRe.js
@@ -26,14 +26,14 @@ function createRootWithClassName(className) {
   var elements = document.getElementsByClassName(className);
   if (elements.length !== 0) {
     return {
-            TAG: "Ok",
-            _0: ReactDom.createRoot(elements[0])
-          };
+      TAG: "Ok",
+      _0: ReactDom.createRoot(elements[0])
+    };
   } else {
     return {
-            TAG: "Error",
-            _0: "ReactDOMRe.Unstable.createRootWithClassName: no element of class " + (className + " found in the HTML.")
-          };
+      TAG: "Error",
+      _0: "ReactDOMRe.Unstable.createRootWithClassName: no element of class " + (className + " found in the HTML.")
+    };
   }
 }
 
@@ -41,14 +41,14 @@ function createRootWithId(id) {
   var element = document.getElementById(id);
   if (element == null) {
     return {
-            TAG: "Error",
-            _0: "ReactDOMRe.Unstable.createRootWithId: no element of id " + (id + " found in the HTML.")
-          };
+      TAG: "Error",
+      _0: "ReactDOMRe.Unstable.createRootWithId: no element of id " + (id + " found in the HTML.")
+    };
   } else {
     return {
-            TAG: "Ok",
-            _0: ReactDom.createRoot(element)
-          };
+      TAG: "Ok",
+      _0: ReactDom.createRoot(element)
+    };
   }
 }
 
@@ -70,10 +70,10 @@ function hydrateToElementWithId(reactElement, id) {
   var element = document.getElementById(id);
   if (element == null) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "ReactDOMRe.hydrateToElementWithId : no element of id " + (id + " found in the HTML."),
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "ReactDOMRe.hydrateToElementWithId : no element of id " + (id + " found in the HTML."),
+      Error: new Error()
+    };
   }
   ReactDom.hydrate(reactElement, element);
 }
diff --git a/jscomp/test/reactTestUtils.js b/jscomp/test/reactTestUtils.js
index e17fd624afe..94bc82f53b8 100644
--- a/jscomp/test/reactTestUtils.js
+++ b/jscomp/test/reactTestUtils.js
@@ -16,8 +16,8 @@ function act(func) {
 
 function actAsync(func) {
   return TestUtils.act(function () {
-              return Curry._1(func, undefined);
-            });
+        return Curry._1(func, undefined);
+      });
 }
 
 function changeWithValue(element, value) {
@@ -53,14 +53,14 @@ function findByAllSelector(element, selector) {
 
 function findBySelectorAndTextContent(element, selector, content) {
   return Belt_Array.getBy(Array.from(element.querySelectorAll(selector)), (function (node) {
-                return node.textContent === content;
-              }));
+          return node.textContent === content;
+        }));
 }
 
 function findBySelectorAndPartialTextContent(element, selector, content) {
   return Belt_Array.getBy(Array.from(element.querySelectorAll(selector)), (function (node) {
-                return node.textContent.includes(content);
-              }));
+          return node.textContent.includes(content);
+        }));
 }
 
 var DOM = {
diff --git a/jscomp/test/reasonReact.js b/jscomp/test/reasonReact.js
index 6bb59657237..c2092592fc7 100644
--- a/jscomp/test/reasonReact.js
+++ b/jscomp/test/reasonReact.js
@@ -38,23 +38,23 @@ function reducerDefault(_action, _state) {
 
 function basicComponent(debugName) {
   return {
-          debugName: debugName,
-          reactClassInternal: debugName,
-          handedOffState: {
-            contents: undefined
-          },
-          willReceiveProps: willReceivePropsDefault,
-          didMount: anyToUnit,
-          didUpdate: anyToUnit,
-          willUnmount: anyToUnit,
-          willUpdate: anyToUnit,
-          shouldUpdate: anyToTrue,
-          render: renderDefault,
-          initialState: initialStateDefault,
-          retainedProps: undefined,
-          reducer: reducerDefault,
-          jsElementWrapped: undefined
-        };
+    debugName: debugName,
+    reactClassInternal: debugName,
+    handedOffState: {
+      contents: undefined
+    },
+    willReceiveProps: willReceivePropsDefault,
+    didMount: anyToUnit,
+    didUpdate: anyToUnit,
+    willUnmount: anyToUnit,
+    willUpdate: anyToUnit,
+    shouldUpdate: anyToTrue,
+    render: renderDefault,
+    initialState: initialStateDefault,
+    retainedProps: undefined,
+    reducer: reducerDefault,
+    jsElementWrapped: undefined
+  };
 }
 
 var statelessComponent = basicComponent;
@@ -77,10 +77,10 @@ function element(keyOpt, refOpt, component) {
     return Curry._2(jsElementWrapped, key, ref);
   } else {
     return React.createElement(component.reactClassInternal, {
-                key: key,
-                ref: ref,
-                reasonProps: element$1
-              });
+          key: key,
+          ref: ref,
+          reasonProps: element$1
+        });
   }
 }
 
@@ -105,21 +105,21 @@ function wrapJsForReason(reactClass, props, children) {
       return Curry._2(React.createElement.apply, null, varargs);
     });
   return {
-          debugName: dummyInteropComponent.debugName,
-          reactClassInternal: dummyInteropComponent.reactClassInternal,
-          handedOffState: dummyInteropComponent.handedOffState,
-          willReceiveProps: dummyInteropComponent.willReceiveProps,
-          didMount: dummyInteropComponent.didMount,
-          didUpdate: dummyInteropComponent.didUpdate,
-          willUnmount: dummyInteropComponent.willUnmount,
-          willUpdate: dummyInteropComponent.willUpdate,
-          shouldUpdate: dummyInteropComponent.shouldUpdate,
-          render: dummyInteropComponent.render,
-          initialState: dummyInteropComponent.initialState,
-          retainedProps: dummyInteropComponent.retainedProps,
-          reducer: dummyInteropComponent.reducer,
-          jsElementWrapped: jsElementWrapped
-        };
+    debugName: dummyInteropComponent.debugName,
+    reactClassInternal: dummyInteropComponent.reactClassInternal,
+    handedOffState: dummyInteropComponent.handedOffState,
+    willReceiveProps: dummyInteropComponent.willReceiveProps,
+    didMount: dummyInteropComponent.didMount,
+    didUpdate: dummyInteropComponent.didUpdate,
+    willUnmount: dummyInteropComponent.willUnmount,
+    willUpdate: dummyInteropComponent.willUpdate,
+    shouldUpdate: dummyInteropComponent.shouldUpdate,
+    render: dummyInteropComponent.render,
+    initialState: dummyInteropComponent.initialState,
+    retainedProps: dummyInteropComponent.retainedProps,
+    reducer: dummyInteropComponent.reducer,
+    jsElementWrapped: jsElementWrapped
+  };
 }
 
 var Router;
diff --git a/jscomp/test/reasonReactRouter.js b/jscomp/test/reasonReactRouter.js
index b5d611445bd..f4aa12637d6 100644
--- a/jscomp/test/reasonReactRouter.js
+++ b/jscomp/test/reasonReactRouter.js
@@ -129,10 +129,10 @@ function urlNotEqual(a, b) {
 
 function url(param) {
   return {
-          path: path(),
-          hash: hash(),
-          search: search()
-        };
+    path: path(),
+    hash: hash(),
+    search: search()
+  };
 }
 
 function watchUrl(callback) {
@@ -181,8 +181,8 @@ function useUrl(serverUrl, param) {
                   }));
           }
           return (function (param) {
-                    unwatchUrl(watcherId);
-                  });
+              unwatchUrl(watcherId);
+            });
         }), []);
   return url$1;
 }
diff --git a/jscomp/test/rec_fun_test.js b/jscomp/test/rec_fun_test.js
index 34a5cbd9975..4077d12d8f5 100644
--- a/jscomp/test/rec_fun_test.js
+++ b/jscomp/test/rec_fun_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js
index 4fde76bdcca..94c38e6a476 100644
--- a/jscomp/test/rec_module_test.js
+++ b/jscomp/test/rec_module_test.js
@@ -109,12 +109,12 @@ function create(l, v, r) {
   var hr;
   hr = typeof r !== "object" ? 0 : r.h;
   return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -125,10 +125,10 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var lv = l.v;
@@ -140,26 +140,26 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rv = r.v;
@@ -171,21 +171,21 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Set.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var v = param.v;
@@ -212,12 +212,12 @@ function add(x, param) {
 
 function singleton(x) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -259,9 +259,9 @@ function min_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -292,9 +292,9 @@ function max_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
@@ -323,10 +323,10 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -349,10 +349,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            false,
-            "Empty"
-          ];
+      "Empty",
+      false,
+      "Empty"
+    ];
   }
   var r = param.r;
   var v = param.v;
@@ -360,25 +360,25 @@ function split(x, param) {
   var c = Curry._2(AAA.compare, x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function is_empty(param) {
@@ -683,9 +683,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var v = param.v;
   var match = partition(p, param.l);
@@ -697,14 +697,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pv) {
     return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, rf)
+    ];
   }
 }
 
@@ -741,9 +741,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     var c = Curry._2(AAA.compare, x, v);
@@ -760,9 +760,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -825,9 +825,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -948,21 +948,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      "Empty",
-                      l
-                    ];
+                "Empty",
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    l: "Empty",
+                    v: l.hd,
+                    r: "Empty",
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -970,21 +970,21 @@ function of_list(l) {
                 var match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: l.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: "Empty",
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -996,27 +996,27 @@ function of_list(l) {
                   var match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: match$2.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -1032,19 +1032,19 @@ function of_list(l) {
         if (l$1) {
           var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
           return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
+            create(match$3[0], l$1.hd, match$4[0]),
+            match$4[1]
+          ];
         }
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "set.res",
+            691,
+            20
+          ],
+          Error: new Error()
+        };
       };
       return sub(List.length(l$1), l$1)[0];
     } else {
@@ -1097,20 +1097,20 @@ var suites_0 = [
   "test1",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: [
-                true,
-                true,
-                false,
-                false
-              ],
-              _1: [
-                Curry._1(A.even, 2),
-                Curry._1(even$1, 4),
-                Curry._1(B.odd, 2),
-                Curry._1(odd$1, 4)
-              ]
-            };
+        TAG: "Eq",
+        _0: [
+          true,
+          true,
+          false,
+          false
+        ],
+        _1: [
+          Curry._1(A.even, 2),
+          Curry._1(even$1, 4),
+          Curry._1(B.odd, 2),
+          Curry._1(odd$1, 4)
+        ]
+      };
     })
 ];
 
@@ -1119,10 +1119,10 @@ var suites_1 = {
     "test2",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: Curry._1(y, undefined),
-                _1: 32
-              };
+          TAG: "Eq",
+          _0: Curry._1(y, undefined),
+          _1: 32
+        };
       })
   ],
   tl: {
@@ -1130,10 +1130,10 @@ var suites_1 = {
       "test3",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: Curry._1(x, undefined),
-                  _1: 35
-                };
+            TAG: "Eq",
+            _0: Curry._1(x, undefined),
+            _1: 35
+          };
         })
     ],
     tl: {
@@ -1141,10 +1141,10 @@ var suites_1 = {
         "test4",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: Curry._1(A.even, 2)
-                  };
+              TAG: "Eq",
+              _0: true,
+              _1: Curry._1(A.even, 2)
+            };
           })
       ],
       tl: {
@@ -1152,10 +1152,10 @@ var suites_1 = {
           "test4",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Curry._1(even$1, 4)
-                    };
+                TAG: "Eq",
+                _0: true,
+                _1: Curry._1(even$1, 4)
+              };
             })
         ],
         tl: {
@@ -1163,10 +1163,10 @@ var suites_1 = {
             "test5",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Curry._1(B.odd, 2)
-                      };
+                  TAG: "Eq",
+                  _0: false,
+                  _1: Curry._1(B.odd, 2)
+                };
               })
           ],
           tl: {
@@ -1174,28 +1174,28 @@ var suites_1 = {
               "test6",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: 2,
-                          _1: Curry._1(cardinal, Curry._1(of_list, {
-                                    hd: {
-                                      TAG: "Leaf",
-                                      _0: "a"
-                                    },
-                                    tl: {
-                                      hd: {
-                                        TAG: "Leaf",
-                                        _0: "b"
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: "Leaf",
-                                          _0: "a"
-                                        },
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }))
-                        };
+                    TAG: "Eq",
+                    _0: 2,
+                    _1: Curry._1(cardinal, Curry._1(of_list, {
+                              hd: {
+                                TAG: "Leaf",
+                                _0: "a"
+                              },
+                              tl: {
+                                hd: {
+                                  TAG: "Leaf",
+                                  _0: "b"
+                                },
+                                tl: {
+                                  hd: {
+                                    TAG: "Leaf",
+                                    _0: "a"
+                                  },
+                                  tl: /* [] */0
+                                }
+                              }
+                            }))
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/recmodule.js b/jscomp/test/recmodule.js
index 41a4c1edce0..f1c55d5b1ab 100644
--- a/jscomp/test/recmodule.js
+++ b/jscomp/test/recmodule.js
@@ -9,13 +9,13 @@ var Entity = {};
 function MakeLayer(Deps) {
   var getLight = function (id) {
     return Curry._1(Deps.presentLight, {
-                id: id,
-                name: "Light 1"
-              });
+          id: id,
+          name: "Light 1"
+        });
   };
   return {
-          getLight: getLight
-        };
+    getLight: getLight
+  };
 }
 
 var UseCase = {
@@ -30,9 +30,9 @@ function MakeLayer$1(Deps, UC) {
     return Curry._1(UC.getLight, req.params.id);
   };
   return {
-          handleGetLight: handleGetLight,
-          presentLight: presentLight
-        };
+    handleGetLight: handleGetLight,
+    presentLight: presentLight
+  };
 }
 
 var Adapter = {
@@ -42,25 +42,25 @@ var Adapter = {
 function MakeLayer$2(Deps) {
   var presentJson = function (json, status) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "recmodule.res",
-            60,
-            41
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "recmodule.res",
+        60,
+        41
+      ],
+      Error: new Error()
+    };
   };
   var routes = function (param) {
     return [[
-              "/lights",
-              Deps.handleGetLight
-            ]];
+        "/lights",
+        Deps.handleGetLight
+      ]];
   };
   return {
-          presentJson: presentJson,
-          routes: routes
-        };
+    presentJson: presentJson,
+    routes: routes
+  };
 }
 
 var Infra = {
@@ -117,21 +117,21 @@ var U = Caml_module.init_mod([
 
 function presentJson(json, status) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "recmodule.res",
-          60,
-          41
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "recmodule.res",
+      60,
+      41
+    ],
+    Error: new Error()
+  };
 }
 
 function routes(param) {
   return [[
-            "/lights",
-            A.handleGetLight
-          ]];
+      "/lights",
+      A.handleGetLight
+    ]];
 }
 
 Caml_module.update_mod({
@@ -178,9 +178,9 @@ Caml_module.update_mod({
 
 function getLight(id) {
   return Curry._1(A.presentLight, {
-              id: id,
-              name: "Light 1"
-            });
+        id: id,
+        name: "Light 1"
+      });
 }
 
 Caml_module.update_mod({
diff --git a/jscomp/test/record_extension_test.js b/jscomp/test/record_extension_test.js
index 0a800c95aa9..4db5bb11908 100644
--- a/jscomp/test/record_extension_test.js
+++ b/jscomp/test/record_extension_test.js
@@ -49,10 +49,10 @@ function f2_with(x) {
     return x;
   } else {
     return {
-            TAG: "C",
-            x: 0,
-            y: x.y
-          };
+      TAG: "C",
+      x: 0,
+      y: x.y
+    };
   }
 }
 
diff --git a/jscomp/test/record_name_test.js b/jscomp/test/record_name_test.js
index 7b193c02080..82a26542bad 100644
--- a/jscomp/test/record_name_test.js
+++ b/jscomp/test/record_name_test.js
@@ -4,8 +4,8 @@
 
 function f(x) {
   return {
-          THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE: x
-        };
+    THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE: x
+  };
 }
 
 function set(x) {
@@ -20,15 +20,15 @@ function f1(u) {
 function f2(x) {
   x["x'"] = x["x'"] + 3 | 0;
   return {
-          "x'": x["x'"] + 3 | 0
-        };
+    "x'": x["x'"] + 3 | 0
+  };
 }
 
 function f3(x) {
   x.in = x.in + 3 | 0;
   return {
-          in: x.in + 3 | 0
-        };
+    in: x.in + 3 | 0
+  };
 }
 
 function f4(param) {
@@ -37,9 +37,9 @@ function f4(param) {
 
 function u(param) {
   return {
-          x: 22,
-          h: 3
-        };
+    x: 22,
+    h: 3
+  };
 }
 
 exports.f = f;
diff --git a/jscomp/test/record_regression.js b/jscomp/test/record_regression.js
index a409a3a88d3..0d52a0f326f 100644
--- a/jscomp/test/record_regression.js
+++ b/jscomp/test/record_regression.js
@@ -57,8 +57,8 @@ newrecord$4.aa = undefined;
 
 function setAA(ao) {
   return {
-          aa: ao
-        };
+    aa: ao
+  };
 }
 
 var ir0 = {
@@ -164,11 +164,11 @@ if (ir2.TAG === "V0") {
 function inlinedRecord(ir) {
   if (ir.TAG !== "V0") {
     return [
-            ir.y0,
-            "n/a",
-            0,
-            ir.y1
-          ];
+      ir.y0,
+      "n/a",
+      0,
+      ir.y1
+    ];
   }
   var x1 = ir.x1;
   var x0 = ir.x0;
@@ -178,22 +178,22 @@ function inlinedRecord(ir) {
           var x2 = ir.x2;
           if (x2 !== undefined) {
             return [
-                    x0,
-                    "x1",
-                    x2,
-                    ir.x3
-                  ];
+              x0,
+              "x1",
+              x2,
+              ir.x3
+            ];
           }
           break;
       case "xx1" :
           var x2$1 = ir.x2;
           if (x2$1 !== undefined) {
             return [
-                    x0,
-                    "xx1",
-                    x2$1,
-                    ir.x3
-                  ];
+              x0,
+              "xx1",
+              x2$1,
+              ir.x3
+            ];
           }
           break;
       default:
@@ -202,35 +202,35 @@ function inlinedRecord(ir) {
     var x2$2 = ir.x2;
     if (x2$2 !== undefined) {
       return [
-              x0,
-              x1,
-              x2$2,
-              ir.x3
-            ];
+        x0,
+        x1,
+        x2$2,
+        ir.x3
+      ];
     } else {
       return [
-              x0,
-              x1,
-              0,
-              ir.x3
-            ];
+        x0,
+        x1,
+        0,
+        ir.x3
+      ];
     }
   }
   var x2$3 = ir.x2;
   if (x2$3 !== undefined) {
     return [
-            x0,
-            "n/a",
-            x2$3,
-            ir.x3
-          ];
+      x0,
+      "n/a",
+      x2$3,
+      ir.x3
+    ];
   } else {
     return [
-            x0,
-            "n/a",
-            0,
-            ir.x3
-          ];
+      x0,
+      "n/a",
+      0,
+      ir.x3
+    ];
   }
 }
 
diff --git a/jscomp/test/record_with_test.js b/jscomp/test/record_with_test.js
index e1b315c7eca..cd2746df382 100644
--- a/jscomp/test/record_with_test.js
+++ b/jscomp/test/record_with_test.js
@@ -27,24 +27,24 @@ var u_v = {
 function f(g, h) {
   var init = Curry._1(g, h);
   return {
-          syntax: init.syntax,
-          imports: 0,
-          file_options: init.file_options,
-          package: init.package,
-          messages: init.messages,
-          enums: init.enums,
-          extends: init.extends
-        };
+    syntax: init.syntax,
+    imports: 0,
+    file_options: init.file_options,
+    package: init.package,
+    messages: init.messages,
+    enums: init.enums,
+    extends: init.extends
+  };
 }
 
 var suites_0 = [
   "eq_with",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: v,
-              _1: u_v
-            };
+        TAG: "Eq",
+        _0: v,
+        _1: u_v
+      };
     })
 ];
 
diff --git a/jscomp/test/recursive_module_test.js b/jscomp/test/recursive_module_test.js
index 4d412483f19..07d1ef5d6fc 100644
--- a/jscomp/test/recursive_module_test.js
+++ b/jscomp/test/recursive_module_test.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -82,11 +82,11 @@ add([
       "File \"recursive_module_test.res\", line 31, characters 14-21",
       (function (param) {
           return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Curry._1(Int3.u, 3);
-                    })
-                };
+            TAG: "ThrowAny",
+            _0: (function (param) {
+                Curry._1(Int3.u, 3);
+              })
+          };
         })
     ]);
 
diff --git a/jscomp/test/recursive_react_component.js b/jscomp/test/recursive_react_component.js
index b389e4231d3..f444a034dbc 100644
--- a/jscomp/test/recursive_react_component.js
+++ b/jscomp/test/recursive_react_component.js
@@ -6,8 +6,8 @@ var React = require("react");
 function make(Props) {
   var foo = Props.foo;
   return React.createElement(make, {
-              foo: foo
-            });
+        foo: foo
+      });
 }
 
 exports.make = make;
diff --git a/jscomp/test/recursive_records_test.js b/jscomp/test/recursive_records_test.js
index ca0328c6564..bf595643a41 100644
--- a/jscomp/test/recursive_records_test.js
+++ b/jscomp/test/recursive_records_test.js
@@ -69,14 +69,14 @@ function tl_exn(x) {
     return x.next;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "recursive_records_test.res",
-          49,
-          11
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "recursive_records_test.res",
+      49,
+      11
+    ],
+    Error: new Error()
+  };
 }
 
 eq("File \"recursive_records_test.res\", line 54, characters 5-12", (hd(rec_cell2) + hd(tl_exn(rec_cell2)) | 0) + hd(tl_exn(tl_exn(rec_cell2))) | 0, 9);
diff --git a/jscomp/test/recursive_unbound_module_test.js b/jscomp/test/recursive_unbound_module_test.js
index f651e96b358..8121c7cad72 100644
--- a/jscomp/test/recursive_unbound_module_test.js
+++ b/jscomp/test/recursive_unbound_module_test.js
@@ -11,8 +11,8 @@ function Make(X) {
     f: f
   };
   return {
-          M: M
-        };
+    M: M
+  };
 }
 
 var B = Caml_module.init_mod([
diff --git a/jscomp/test/return_check.js b/jscomp/test/return_check.js
index 961218c89d0..c687f35716a 100644
--- a/jscomp/test/return_check.js
+++ b/jscomp/test/return_check.js
@@ -19,14 +19,14 @@ function f_undefined(xs, i) {
     return k;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          23,
-          12
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "return_check.res",
+      23,
+      12
+    ],
+    Error: new Error()
+  };
 }
 
 function f_escaped_not(xs, i) {
@@ -60,14 +60,14 @@ function f_null(xs, i) {
     return k;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          51,
-          12
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "return_check.res",
+      51,
+      12
+    ],
+    Error: new Error()
+  };
 }
 
 function f_null_undefined(xs, i) {
@@ -76,14 +76,14 @@ function f_null_undefined(xs, i) {
     return k;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          59,
-          12
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "return_check.res",
+      59,
+      12
+    ],
+    Error: new Error()
+  };
 }
 
 exports.test = test;
diff --git a/jscomp/test/set_gen.js b/jscomp/test/set_gen.js
index ef79fa19f2d..392cab2bd80 100644
--- a/jscomp/test/set_gen.js
+++ b/jscomp/test/set_gen.js
@@ -37,9 +37,9 @@ function min_elt(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = x._0;
     if (typeof l !== "object") {
@@ -55,9 +55,9 @@ function max_elt(_x) {
     var x = _x;
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = x._2;
     if (typeof r !== "object") {
@@ -208,16 +208,16 @@ function check_height_and_diff(x) {
   var hr = check_height_and_diff(x._2);
   if (h !== (max_int_2(hl, hr) + 1 | 0)) {
     throw {
-          RE_EXN_ID: Height_invariant_broken,
-          Error: new Error()
-        };
+      RE_EXN_ID: Height_invariant_broken,
+      Error: new Error()
+    };
   }
   var diff = Pervasives.abs(hl - hr | 0);
   if (diff > 2) {
     throw {
-          RE_EXN_ID: Height_diff_borken,
-          Error: new Error()
-        };
+      RE_EXN_ID: Height_diff_borken,
+      Error: new Error()
+    };
   }
   return h;
 }
@@ -232,12 +232,12 @@ function create(l, v, r) {
   var hr;
   hr = typeof r !== "object" ? 0 : r._3;
   return {
-          TAG: "Node",
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    _0: l,
+    _1: v,
+    _2: r,
+    _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function internal_bal(l, v, r) {
@@ -248,14 +248,14 @@ function internal_bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "set_gen.res",
-              278,
-              15
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "set_gen.res",
+          278,
+          15
+        ],
+        Error: new Error()
+      };
     }
     var lr = l._2;
     var lv = l._1;
@@ -267,34 +267,34 @@ function internal_bal(l, v, r) {
       return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            288,
-            19
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "set_gen.res",
+        288,
+        19
+      ],
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            300,
-            15
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "set_gen.res",
+        300,
+        15
+      ],
+      Error: new Error()
+    };
   }
   var rr = r._2;
   var rv = r._1;
@@ -306,23 +306,23 @@ function internal_bal(l, v, r) {
     return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "set_gen.res",
-          306,
-          19
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "set_gen.res",
+      306,
+      19
+    ],
+    Error: new Error()
+  };
 }
 
 function remove_min_elt(x) {
   if (typeof x !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = x._0;
   if (typeof l !== "object") {
@@ -334,12 +334,12 @@ function remove_min_elt(x) {
 
 function singleton(x) {
   return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: "Empty",
-          _3: 1
-        };
+    TAG: "Node",
+    _0: "Empty",
+    _1: x,
+    _2: "Empty",
+    _3: 1
+  };
 }
 
 function internal_merge(l, r) {
@@ -414,9 +414,9 @@ function filter(p, x) {
 function partition(p, x) {
   if (typeof x !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var v = x._1;
   var match = partition(p, x._0);
@@ -428,14 +428,14 @@ function partition(p, x) {
   var rt = match$1[0];
   if (pv) {
     return [
-            internal_join(lt, v, rt),
-            internal_concat(lf, rf)
-          ];
+      internal_join(lt, v, rt),
+      internal_concat(lf, rf)
+    ];
   } else {
     return [
-            internal_concat(lt, rt),
-            internal_join(lf, v, rf)
-          ];
+      internal_concat(lt, rt),
+      internal_join(lf, v, rf)
+    ];
   }
 }
 
@@ -444,21 +444,21 @@ function of_sorted_list(l) {
     switch (n) {
       case 0 :
           return [
-                  "Empty",
-                  l
-                ];
+            "Empty",
+            l
+          ];
       case 1 :
           if (l) {
             return [
-                    {
-                      TAG: "Node",
-                      _0: "Empty",
-                      _1: l.hd,
-                      _2: "Empty",
-                      _3: 1
-                    },
-                    l.tl
-                  ];
+              {
+                TAG: "Node",
+                _0: "Empty",
+                _1: l.hd,
+                _2: "Empty",
+                _3: 1
+              },
+              l.tl
+            ];
           }
           break;
       case 2 :
@@ -466,21 +466,21 @@ function of_sorted_list(l) {
             var match = l.tl;
             if (match) {
               return [
-                      {
-                        TAG: "Node",
-                        _0: {
-                          TAG: "Node",
-                          _0: "Empty",
-                          _1: l.hd,
-                          _2: "Empty",
-                          _3: 1
-                        },
-                        _1: match.hd,
-                        _2: "Empty",
-                        _3: 2
-                      },
-                      match.tl
-                    ];
+                {
+                  TAG: "Node",
+                  _0: {
+                    TAG: "Node",
+                    _0: "Empty",
+                    _1: l.hd,
+                    _2: "Empty",
+                    _3: 1
+                  },
+                  _1: match.hd,
+                  _2: "Empty",
+                  _3: 2
+                },
+                match.tl
+              ];
             }
             
           }
@@ -492,27 +492,27 @@ function of_sorted_list(l) {
               var match$2 = match$1.tl;
               if (match$2) {
                 return [
-                        {
-                          TAG: "Node",
-                          _0: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: l.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _1: match$1.hd,
-                          _2: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: match$2.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _3: 2
-                        },
-                        match$2.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    _0: {
+                      TAG: "Node",
+                      _0: "Empty",
+                      _1: l.hd,
+                      _2: "Empty",
+                      _3: 1
+                    },
+                    _1: match$1.hd,
+                    _2: {
+                      TAG: "Node",
+                      _0: "Empty",
+                      _1: match$2.hd,
+                      _2: "Empty",
+                      _3: 1
+                    },
+                    _3: 2
+                  },
+                  match$2.tl
+                ];
               }
               
             }
@@ -528,19 +528,19 @@ function of_sorted_list(l) {
     if (l$1) {
       var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
       return [
-              create(match$3[0], l$1.hd, match$4[0]),
-              match$4[1]
-            ];
+        create(match$3[0], l$1.hd, match$4[0]),
+        match$4[1]
+      ];
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            447,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "set_gen.res",
+        447,
+        18
+      ],
+      Error: new Error()
+    };
   };
   return sub(List.length(l), l)[0];
 }
@@ -553,53 +553,53 @@ function of_sorted_array(l) {
     if (n === 1) {
       var x0 = l[start];
       return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x0,
-              _2: "Empty",
-              _3: 1
-            };
+        TAG: "Node",
+        _0: "Empty",
+        _1: x0,
+        _2: "Empty",
+        _3: 1
+      };
     }
     if (n === 2) {
       var x0$1 = l[start];
       var x1 = l[start + 1 | 0];
       return {
-              TAG: "Node",
-              _0: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x0$1,
-                _2: "Empty",
-                _3: 1
-              },
-              _1: x1,
-              _2: "Empty",
-              _3: 2
-            };
+        TAG: "Node",
+        _0: {
+          TAG: "Node",
+          _0: "Empty",
+          _1: x0$1,
+          _2: "Empty",
+          _3: 1
+        },
+        _1: x1,
+        _2: "Empty",
+        _3: 2
+      };
     }
     if (n === 3) {
       var x0$2 = l[start];
       var x1$1 = l[start + 1 | 0];
       var x2 = l[start + 2 | 0];
       return {
-              TAG: "Node",
-              _0: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x0$2,
-                _2: "Empty",
-                _3: 1
-              },
-              _1: x1$1,
-              _2: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x2,
-                _2: "Empty",
-                _3: 1
-              },
-              _3: 2
-            };
+        TAG: "Node",
+        _0: {
+          TAG: "Node",
+          _0: "Empty",
+          _1: x0$2,
+          _2: "Empty",
+          _3: 1
+        },
+        _1: x1$1,
+        _2: {
+          TAG: "Node",
+          _0: "Empty",
+          _1: x2,
+          _2: "Empty",
+          _3: 1
+        },
+        _3: 2
+      };
     }
     var nl = n / 2 | 0;
     var left = sub(start, nl, l);
@@ -627,12 +627,12 @@ function is_ordered(cmp, tree) {
       if (typeof match$2 !== "object") {
         if (match$2 === "Empty" && Curry._2(cmp, max_v, v) < 0) {
           return {
-                  NAME: "V",
-                  VAL: [
-                    min_v,
-                    v
-                  ]
-                };
+            NAME: "V",
+            VAL: [
+              min_v,
+              v
+            ]
+          };
         } else {
           return "No";
         }
@@ -640,12 +640,12 @@ function is_ordered(cmp, tree) {
       var match$3 = match$2.VAL;
       if (Curry._2(cmp, max_v, match$3[0]) < 0) {
         return {
-                NAME: "V",
-                VAL: [
-                  min_v,
-                  match$3[1]
-                ]
-              };
+          NAME: "V",
+          VAL: [
+            min_v,
+            match$3[1]
+          ]
+        };
       } else {
         return "No";
       }
@@ -657,12 +657,12 @@ function is_ordered(cmp, tree) {
     if (typeof match$4 !== "object") {
       if (match$4 === "Empty") {
         return {
-                NAME: "V",
-                VAL: [
-                  v,
-                  v
-                ]
-              };
+          NAME: "V",
+          VAL: [
+            v,
+            v
+          ]
+        };
       } else {
         return "No";
       }
@@ -670,12 +670,12 @@ function is_ordered(cmp, tree) {
     var match$5 = match$4.VAL;
     if (Curry._2(cmp, v, match$5[0]) < 0) {
       return {
-              NAME: "V",
-              VAL: [
-                v,
-                match$5[1]
-              ]
-            };
+        NAME: "V",
+        VAL: [
+          v,
+          match$5[1]
+        ]
+      };
     } else {
       return "No";
     }
diff --git a/jscomp/test/sexp.js b/jscomp/test/sexp.js
index b6842fafc7d..2f80fed91ef 100644
--- a/jscomp/test/sexp.js
+++ b/jscomp/test/sexp.js
@@ -17,130 +17,130 @@ var hash = Hashtbl.hash;
 
 function of_int(x) {
   return {
-          NAME: "Atom",
-          VAL: String(x)
-        };
+    NAME: "Atom",
+    VAL: String(x)
+  };
 }
 
 function of_float(x) {
   return {
-          NAME: "Atom",
-          VAL: Pervasives.string_of_float(x)
-        };
+    NAME: "Atom",
+    VAL: Pervasives.string_of_float(x)
+  };
 }
 
 function of_bool(x) {
   return {
-          NAME: "Atom",
-          VAL: x ? "true" : "false"
-        };
+    NAME: "Atom",
+    VAL: x ? "true" : "false"
+  };
 }
 
 function atom(x) {
   return {
-          NAME: "Atom",
-          VAL: x
-        };
+    NAME: "Atom",
+    VAL: x
+  };
 }
 
 function of_list(l) {
   return {
-          NAME: "List",
-          VAL: l
-        };
+    NAME: "List",
+    VAL: l
+  };
 }
 
 function of_rev_list(l) {
   return {
-          NAME: "List",
-          VAL: List.rev(l)
-        };
+    NAME: "List",
+    VAL: List.rev(l)
+  };
 }
 
 function of_pair(param) {
   return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: /* [] */0
-            }
-          }
-        };
+    NAME: "List",
+    VAL: {
+      hd: param[0],
+      tl: {
+        hd: param[1],
+        tl: /* [] */0
+      }
+    }
+  };
 }
 
 function of_triple(param) {
   return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: {
-                hd: param[2],
-                tl: /* [] */0
-              }
-            }
-          }
-        };
+    NAME: "List",
+    VAL: {
+      hd: param[0],
+      tl: {
+        hd: param[1],
+        tl: {
+          hd: param[2],
+          tl: /* [] */0
+        }
+      }
+    }
+  };
 }
 
 function of_quad(param) {
   return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: {
-                hd: param[2],
-                tl: {
-                  hd: param[3],
-                  tl: /* [] */0
-                }
-              }
-            }
+    NAME: "List",
+    VAL: {
+      hd: param[0],
+      tl: {
+        hd: param[1],
+        tl: {
+          hd: param[2],
+          tl: {
+            hd: param[3],
+            tl: /* [] */0
           }
-        };
+        }
+      }
+    }
+  };
 }
 
 function of_variant(name, args) {
   return {
-          NAME: "List",
-          VAL: {
-            hd: {
-              NAME: "Atom",
-              VAL: name
-            },
-            tl: args
-          }
-        };
+    NAME: "List",
+    VAL: {
+      hd: {
+        NAME: "Atom",
+        VAL: name
+      },
+      tl: args
+    }
+  };
 }
 
 function of_field(name, t) {
   return {
-          NAME: "List",
-          VAL: {
-            hd: {
-              NAME: "Atom",
-              VAL: name
-            },
-            tl: {
-              hd: t,
-              tl: /* [] */0
-            }
-          }
-        };
+    NAME: "List",
+    VAL: {
+      hd: {
+        NAME: "Atom",
+        VAL: name
+      },
+      tl: {
+        hd: t,
+        tl: /* [] */0
+      }
+    }
+  };
 }
 
 function of_record(l) {
   return {
-          NAME: "List",
-          VAL: List.map((function (param) {
-                  return of_field(param[0], param[1]);
-                }), l)
-        };
+    NAME: "List",
+    VAL: List.map((function (param) {
+            return of_field(param[0], param[1]);
+          }), l)
+  };
 }
 
 function $$return(x) {
@@ -256,8 +256,8 @@ function to_float(e) {
 
 function to_string(e) {
   return _try_atom(e, (function (x) {
-                return x;
-              }));
+          return x;
+        }));
 }
 
 function to_pair(e) {
@@ -274,25 +274,25 @@ function to_pair(e) {
   var match$1 = match.tl;
   if (match$1 && !match$1.tl) {
     return [
-            match.hd,
-            match$1.hd
-          ];
+      match.hd,
+      match$1.hd
+    ];
   }
   
 }
 
 function to_pair_with(f1, f2, e) {
   return $great$great$eq(to_pair(e), (function (param) {
-                var y = param[1];
-                return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
-                              return $great$great$eq(Curry._1(f2, y), (function (y) {
-                                            return [
-                                                    x,
-                                                    y
-                                                  ];
-                                          }));
-                            }));
-              }));
+          var y = param[1];
+          return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
+                  return $great$great$eq(Curry._1(f2, y), (function (y) {
+                          return [
+                            x,
+                            y
+                          ];
+                        }));
+                }));
+        }));
 }
 
 function to_triple(e) {
@@ -313,30 +313,30 @@ function to_triple(e) {
   var match$2 = match$1.tl;
   if (match$2 && !match$2.tl) {
     return [
-            match.hd,
-            match$1.hd,
-            match$2.hd
-          ];
+      match.hd,
+      match$1.hd,
+      match$2.hd
+    ];
   }
   
 }
 
 function to_triple_with(f1, f2, f3, e) {
   return $great$great$eq(to_triple(e), (function (param) {
-                var z = param[2];
-                var y = param[1];
-                return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
-                              return $great$great$eq(Curry._1(f2, y), (function (y) {
-                                            return $great$great$eq(Curry._1(f3, z), (function (z) {
-                                                          return [
-                                                                  x,
-                                                                  y,
-                                                                  z
-                                                                ];
-                                                        }));
-                                          }));
-                            }));
-              }));
+          var z = param[2];
+          var y = param[1];
+          return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
+                  return $great$great$eq(Curry._1(f2, y), (function (y) {
+                          return $great$great$eq(Curry._1(f3, z), (function (z) {
+                                  return [
+                                    x,
+                                    y,
+                                    z
+                                  ];
+                                }));
+                        }));
+                }));
+        }));
 }
 
 function to_list(e) {
@@ -486,10 +486,10 @@ function get_exn(e) {
     return Caml_option.valFromOption(e);
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "CCSexp.Traverse.get_exn",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "CCSexp.Traverse.get_exn",
+    Error: new Error()
+  };
 }
 
 var of_unit = {
diff --git a/jscomp/test/sexpm.js b/jscomp/test/sexpm.js
index de38992dbb1..560a00743ee 100644
--- a/jscomp/test/sexpm.js
+++ b/jscomp/test/sexpm.js
@@ -24,15 +24,15 @@ function _must_escape(s) {
             exit = 1;
           } else {
             throw {
-                  RE_EXN_ID: Pervasives.Exit,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Pervasives.Exit,
+              Error: new Error()
+            };
           }
         } else {
           throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
+            RE_EXN_ID: Pervasives.Exit,
+            Error: new Error()
+          };
         }
       } else if (c >= 11) {
         if (c >= 32) {
@@ -50,9 +50,9 @@ function _must_escape(s) {
             case 40 :
             case 41 :
                 throw {
-                      RE_EXN_ID: Pervasives.Exit,
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Pervasives.Exit,
+                  Error: new Error()
+                };
             
           }
         } else {
@@ -61,17 +61,17 @@ function _must_escape(s) {
       } else {
         if (c >= 9) {
           throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
+            RE_EXN_ID: Pervasives.Exit,
+            Error: new Error()
+          };
         }
         exit = 1;
       }
       if (exit === 1 && c > 127) {
         throw {
-              RE_EXN_ID: Pervasives.Exit,
-              Error: new Error()
-            };
+          RE_EXN_ID: Pervasives.Exit,
+          Error: new Error()
+        };
       }
       
     }
@@ -126,14 +126,14 @@ function make(bufsizeOpt, refill) {
   var bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024;
   var bufsize$1 = Caml.int_min(bufsize > 16 ? bufsize : 16, Sys.max_string_length);
   return {
-          buf: Caml_bytes.create(bufsize$1),
-          refill: refill,
-          atom: $$Buffer.create(32),
-          i: 0,
-          len: 0,
-          line: 1,
-          col: 1
-        };
+    buf: Caml_bytes.create(bufsize$1),
+    refill: refill,
+    atom: $$Buffer.create(32),
+    i: 0,
+    len: 0,
+    line: 1,
+    col: 1
+  };
 }
 
 function _is_digit(c) {
@@ -158,14 +158,14 @@ function _refill(t, k_succ, k_fail) {
 function _get(t) {
   if (t.i >= t.len) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "sexpm.res",
-            111,
-            4
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "sexpm.res",
+        111,
+        4
+      ],
+      Error: new Error()
+    };
   }
   var c = Caml_bytes.get(t.buf, t.i);
   t.i = t.i + 1 | 0;
@@ -187,9 +187,9 @@ function _error(param) {
     $$Buffer.add_string(b, msg);
     var msg$p = $$Buffer.contents(b);
     return {
-            NAME: "Error",
-            VAL: msg$p
-          };
+      NAME: "Error",
+      VAL: msg$p
+    };
   };
 }
 
@@ -201,8 +201,8 @@ function expr(k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return expr(k, param);
-                  }), _error_eof);
+              return expr(k, param);
+            }), _error_eof);
     }
     var c = _get(t);
     if (c >= 11) {
@@ -222,8 +222,8 @@ function expr_starting_with(c, k, t) {
   if (c >= 42) {
     if (c === 59) {
       return skip_comment((function (param, param$1) {
-                    return expr(k, t);
-                  }), t);
+              return expr(k, t);
+            }), t);
     }
     if (c === 92) {
       return _error(t)("unexpected '\\'");
@@ -234,14 +234,14 @@ function expr_starting_with(c, k, t) {
       switch (c) {
         case 32 :
             throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "sexpm.res",
-                    152,
-                    27
-                  ],
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Assert_failure",
+              _1: [
+                "sexpm.res",
+                152,
+                27
+              ],
+              Error: new Error()
+            };
         case 34 :
             return quoted(k, t);
         case 33 :
@@ -261,14 +261,14 @@ function expr_starting_with(c, k, t) {
     
   } else if (c >= 9) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "sexpm.res",
-            152,
-            27
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "sexpm.res",
+        152,
+        27
+      ],
+      Error: new Error()
+    };
   }
   $$Buffer.add_char(t.atom, c);
   return atom(k, t);
@@ -278,53 +278,53 @@ function expr_list(acc, k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return expr_list(acc, k, param);
-                  }), _error_eof);
+              return expr_list(acc, k, param);
+            }), _error_eof);
     }
     var c = _get(t);
     if (c > 32 || c < 9) {
       if (c === 41) {
         return Curry._2(k, undefined, {
-                    NAME: "List",
-                    VAL: List.rev(acc)
-                  });
+              NAME: "List",
+              VAL: List.rev(acc)
+            });
       }
       
     } else if (c > 31 || c < 11) {
       continue ;
     }
     return expr_starting_with(c, (function (last, e) {
-                  if (last !== undefined) {
-                    if (last !== 40) {
-                      if (last !== 41) {
+            if (last !== undefined) {
+              if (last !== 40) {
+                if (last !== 41) {
+                  return expr_list({
+                        hd: e,
+                        tl: acc
+                      }, k, t);
+                } else {
+                  return Curry._2(k, undefined, {
+                        NAME: "List",
+                        VAL: List.rev({
+                              hd: e,
+                              tl: acc
+                            })
+                      });
+                }
+              } else {
+                return expr_list(/* [] */0, (function (param, l) {
                         return expr_list({
-                                    hd: e,
-                                    tl: acc
-                                  }, k, t);
-                      } else {
-                        return Curry._2(k, undefined, {
-                                    NAME: "List",
-                                    VAL: List.rev({
-                                          hd: e,
-                                          tl: acc
-                                        })
-                                  });
-                      }
-                    } else {
-                      return expr_list(/* [] */0, (function (param, l) {
-                                    return expr_list({
-                                                hd: l,
-                                                tl: acc
-                                              }, k, t);
-                                  }), t);
-                    }
-                  } else {
-                    return expr_list({
-                                hd: e,
-                                tl: acc
-                              }, k, t);
-                  }
-                }), t);
+                              hd: l,
+                              tl: acc
+                            }, k, t);
+                      }), t);
+              }
+            } else {
+              return expr_list({
+                    hd: e,
+                    tl: acc
+                  }, k, t);
+            }
+          }), t);
   };
 }
 
@@ -332,19 +332,19 @@ function _return_atom(last, k, t) {
   var s = $$Buffer.contents(t.atom);
   t.atom.position = 0;
   return Curry._2(k, last, {
-              NAME: "Atom",
-              VAL: s
-            });
+        NAME: "Atom",
+        VAL: s
+      });
 }
 
 function atom(k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return atom(k, param);
-                  }), (function (param) {
-                    return _return_atom(undefined, k, param);
-                  }));
+              return atom(k, param);
+            }), (function (param) {
+              return _return_atom(undefined, k, param);
+            }));
     }
     var c = _get(t);
     var exit = 0;
@@ -391,8 +391,8 @@ function quoted(k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return quoted(k, param);
-                  }), _error_eof);
+              return quoted(k, param);
+            }), _error_eof);
     }
     var c = _get(t);
     if (c === 34) {
@@ -400,9 +400,9 @@ function quoted(k, t) {
     }
     if (c === 92) {
       return escaped((function (c) {
-                    $$Buffer.add_char(t.atom, c);
-                    return quoted(k, t);
-                  }), t);
+              $$Buffer.add_char(t.atom, c);
+              return quoted(k, t);
+            }), t);
     }
     $$Buffer.add_char(t.atom, c);
     continue ;
@@ -412,8 +412,8 @@ function quoted(k, t) {
 function escaped(k, t) {
   if (t.i === t.len) {
     return _refill(t, (function (param) {
-                  return escaped(k, param);
-                }), _error_eof);
+            return escaped(k, param);
+          }), _error_eof);
   }
   var c = _get(t);
   if (c >= 92) {
@@ -459,8 +459,8 @@ function escaped(k, t) {
   }
   if (_is_digit(c)) {
     return read2int(c - /* '0' */48 | 0, (function (n) {
-                  return Curry._1(k, Char.chr(n));
-                }), t);
+            return Curry._1(k, Char.chr(n));
+          }), t);
   } else {
     return _error(t)("unexpected escaped char '" + (c + "'"));
   }
@@ -469,8 +469,8 @@ function escaped(k, t) {
 function read2int(i, k, t) {
   if (t.i === t.len) {
     return _refill(t, (function (param) {
-                  return read2int(i, k, param);
-                }), _error_eof);
+            return read2int(i, k, param);
+          }), _error_eof);
   }
   var c = _get(t);
   if (_is_digit(c)) {
@@ -483,8 +483,8 @@ function read2int(i, k, t) {
 function read1int(i, k, t) {
   if (t.i === t.len) {
     return _refill(t, (function (param) {
-                  return read1int(i, k, param);
-                }), _error_eof);
+            return read1int(i, k, param);
+          }), _error_eof);
   }
   var c = _get(t);
   if (_is_digit(c)) {
@@ -498,8 +498,8 @@ function skip_comment(k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return skip_comment(k, param);
-                  }), _error_eof);
+              return skip_comment(k, param);
+            }), _error_eof);
     }
     var match = _get(t);
     if (match === 10) {
@@ -513,10 +513,10 @@ function expr_or_end(k, t) {
   while(true) {
     if (t.i === t.len) {
       return _refill(t, (function (param) {
-                    return expr_or_end(k, param);
-                  }), (function (param) {
-                    return "End";
-                  }));
+              return expr_or_end(k, param);
+            }), (function (param) {
+              return "End";
+            }));
     }
     var c = _get(t);
     if (c >= 11) {
@@ -534,11 +534,11 @@ function expr_or_end(k, t) {
 
 function next(t) {
   return expr_or_end((function (param, x) {
-                return {
-                        NAME: "Ok",
-                        VAL: x
-                      };
-              }), t);
+          return {
+            NAME: "Ok",
+            VAL: x
+          };
+        }), t);
 }
 
 function parse_string(s) {
@@ -561,9 +561,9 @@ function parse_string(s) {
     return res;
   } else {
     return {
-            NAME: "Error",
-            VAL: "unexpected end of file"
-          };
+      NAME: "Error",
+      VAL: "unexpected end of file"
+    };
   }
 }
 
diff --git a/jscomp/test/sexpm_test.js b/jscomp/test/sexpm_test.js
index a5880b80d85..2a49758dbb6 100644
--- a/jscomp/test/sexpm_test.js
+++ b/jscomp/test/sexpm_test.js
@@ -21,10 +21,10 @@ function eq(loc, param) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/splice_test.js b/jscomp/test/splice_test.js
index c702357898e..d359dcd1167 100644
--- a/jscomp/test/splice_test.js
+++ b/jscomp/test/splice_test.js
@@ -180,9 +180,9 @@ var Pipe = {
 
 function f1(c) {
   return Caml_splice_call.spliceApply(Math.max, [
-              1,
-              c
-            ]);
+        1,
+        c
+      ]);
 }
 
 eq("File \"splice_test.res\", line 109, characters 3-10", Math.max(1, 2, 3), 3);
diff --git a/jscomp/test/stack_test.js b/jscomp/test/stack_test.js
index dc7dc1d548f..ddb7a34f970 100644
--- a/jscomp/test/stack_test.js
+++ b/jscomp/test/stack_test.js
@@ -31,19 +31,19 @@ var suites_0 = [
   "push_test",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: {
-                hd: 1,
-                tl: {
-                  hd: 4,
-                  tl: {
-                    hd: 3,
-                    tl: /* [] */0
-                  }
-                }
-              },
-              _1: v()
-            };
+        TAG: "Eq",
+        _0: {
+          hd: 1,
+          tl: {
+            hd: 4,
+            tl: {
+              hd: 3,
+              tl: /* [] */0
+            }
+          }
+        },
+        _1: v()
+      };
     })
 ];
 
diff --git a/jscomp/test/stream_parser_test.js b/jscomp/test/stream_parser_test.js
index d6b499381bb..958d579ce2d 100644
--- a/jscomp/test/stream_parser_test.js
+++ b/jscomp/test/stream_parser_test.js
@@ -26,9 +26,9 @@ function parse(token) {
     }
     catch (exn){
       return {
-              TAG: "Kwd",
-              _0: "=="
-            };
+        TAG: "Kwd",
+        _0: "=="
+      };
     }
   };
   var parse_atom = function (param) {
@@ -43,32 +43,32 @@ function parse(token) {
                 return v;
               }
               throw {
-                    RE_EXN_ID: Parse_error,
-                    _1: "Unbalanced parens",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Parse_error,
+                _1: "Unbalanced parens",
+                Error: new Error()
+              };
             }
             throw {
-                  RE_EXN_ID: Parse_error,
-                  _1: "Unbalanced parens",
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              _1: "Unbalanced parens",
+              Error: new Error()
+            };
           }
           Queue.push(n, look_ahead);
           throw {
-                RE_EXN_ID: Parse_error,
-                _1: "unexpected token",
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            _1: "unexpected token",
+            Error: new Error()
+          };
       case "Int" :
           return n._0;
       default:
         Queue.push(n, look_ahead);
         throw {
-              RE_EXN_ID: Parse_error,
-              _1: "unexpected token",
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          _1: "unexpected token",
+          Error: new Error()
+        };
     }
   };
   var parse_term_aux = function (e1) {
@@ -107,14 +107,14 @@ function parse(token) {
   };
   var r = parse_expr_aux(parse_term_aux(parse_atom()));
   return [
-          r,
-          Queue.fold((function (acc, x) {
-                  return {
-                          hd: x,
-                          tl: acc
-                        };
-                }), /* [] */0, look_ahead)
-        ];
+    r,
+    Queue.fold((function (acc, x) {
+            return {
+              hd: x,
+              tl: acc
+            };
+          }), /* [] */0, look_ahead)
+  ];
 }
 
 var lexer = Genlex.make_lexer({
@@ -159,9 +159,9 @@ function l_parse(token) {
     }
     catch (exn){
       return {
-              TAG: "Kwd",
-              _0: "=="
-            };
+        TAG: "Kwd",
+        _0: "=="
+      };
     }
   };
   var parse_f_aux = function (_a) {
@@ -198,30 +198,30 @@ function l_parse(token) {
                 return v;
               }
               throw {
-                    RE_EXN_ID: Parse_error,
-                    _1: "Unbalanced )",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Parse_error,
+                _1: "Unbalanced )",
+                Error: new Error()
+              };
             }
             throw {
-                  RE_EXN_ID: Parse_error,
-                  _1: "Unbalanced )",
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              _1: "Unbalanced )",
+              Error: new Error()
+            };
           }
           throw {
-                RE_EXN_ID: Parse_error,
-                _1: "Unexpected token",
-                Error: new Error()
-              };
+            RE_EXN_ID: Parse_error,
+            _1: "Unexpected token",
+            Error: new Error()
+          };
       case "Int" :
           return i._0;
       default:
         throw {
-              RE_EXN_ID: Parse_error,
-              _1: "Unexpected token",
-              Error: new Error()
-            };
+          RE_EXN_ID: Parse_error,
+          _1: "Unexpected token",
+          Error: new Error()
+        };
     }
   };
   var parse_t_aux = function (_a) {
@@ -248,14 +248,14 @@ function l_parse(token) {
   };
   var r = parse_t_aux(parse_f_aux(parse_f()));
   return [
-          r,
-          Queue.fold((function (acc, x) {
-                  return {
-                          hd: x,
-                          tl: acc
-                        };
-                }), /* [] */0, look_ahead)
-        ];
+    r,
+    Queue.fold((function (acc, x) {
+            return {
+              hd: x,
+              tl: acc
+            };
+          }), /* [] */0, look_ahead)
+  ];
 }
 
 var suites = {
@@ -273,10 +273,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/string_get_set_test.js b/jscomp/test/string_get_set_test.js
index e3c044a9c74..abe0db83a2c 100644
--- a/jscomp/test/string_get_set_test.js
+++ b/jscomp/test/string_get_set_test.js
@@ -9,10 +9,10 @@ Mt.from_pair_suites("string_get_set_test.res", {
         "File \"string_get_set_test.res\", line 4, characters 36-43",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: Caml_string.get("h", 0),
-                    _1: /* 'h' */104
-                  };
+              TAG: "Eq",
+              _0: Caml_string.get("h", 0),
+              _1: /* 'h' */104
+            };
           })
       ],
       tl: /* [] */0
diff --git a/jscomp/test/string_runtime_test.js b/jscomp/test/string_runtime_test.js
index e6f5944f2ac..e417bdbe884 100644
--- a/jscomp/test/string_runtime_test.js
+++ b/jscomp/test/string_runtime_test.js
@@ -11,10 +11,10 @@ var suites_0 = [
   "?is_printable",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: Test_char.caml_is_printable(/* 'a' */97),
-              _1: true
-            };
+        TAG: "Eq",
+        _0: Test_char.caml_is_printable(/* 'a' */97),
+        _1: true
+      };
     })
 ];
 
@@ -26,11 +26,11 @@ var suites_1 = {
                     var b = Caml_bytes.create(x);
                     Bytes.fill(b, 0, x, /* 'c' */99);
                     return [
-                            Bytes.to_string(b),
-                            Bytes.unsafe_to_string(Bytes.init(x, (function (param) {
-                                        return /* 'c' */99;
-                                      })))
-                          ];
+                      Bytes.to_string(b),
+                      Bytes.unsafe_to_string(Bytes.init(x, (function (param) {
+                                  return /* 'c' */99;
+                                })))
+                    ];
                   }), {
                   hd: 1000,
                   tl: {
@@ -54,10 +54,10 @@ var suites_1 = {
                   }
                 }));
         return {
-                TAG: "Eq",
-                _0: match[0],
-                _1: match[1]
-              };
+          TAG: "Eq",
+          _0: match[0],
+          _1: match[1]
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/string_set.js b/jscomp/test/string_set.js
index dd33e53c0b1..1b25c909bde 100644
--- a/jscomp/test/string_set.js
+++ b/jscomp/test/string_set.js
@@ -10,10 +10,10 @@ var Set_gen = require("./set_gen.js");
 function split(x, tree) {
   if (typeof tree !== "object") {
     return [
-            "Empty",
-            false,
-            "Empty"
-          ];
+      "Empty",
+      false,
+      "Empty"
+    ];
   }
   var r = tree._2;
   var v = tree._1;
@@ -21,36 +21,36 @@ function split(x, tree) {
   var c = Caml.string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            Set_gen.internal_join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      Set_gen.internal_join(match[2], v, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          Set_gen.internal_join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    Set_gen.internal_join(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function add(x, tree) {
   if (typeof tree !== "object") {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: "Empty",
+      _3: 1
+    };
   }
   var r = tree._2;
   var v = tree._1;
@@ -224,9 +224,9 @@ function find(x, _tree) {
     var tree = _tree;
     if (typeof tree !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = tree._1;
     var c = Caml.string_compare(x, v);
@@ -272,8 +272,8 @@ function of_list(l) {
 
 function of_array(l) {
   return $$Array.fold_left((function (acc, x) {
-                return add(x, acc);
-              }), "Empty", l);
+          return add(x, acc);
+        }), "Empty", l);
 }
 
 function invariant(t) {
diff --git a/jscomp/test/string_set_test.js b/jscomp/test/string_set_test.js
index 724e4e1c28c..8329723484e 100644
--- a/jscomp/test/string_set_test.js
+++ b/jscomp/test/string_set_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/string_test.js b/jscomp/test/string_test.js
index 30571ddd1bb..71fbb1f1a84 100644
--- a/jscomp/test/string_test.js
+++ b/jscomp/test/string_test.js
@@ -61,17 +61,17 @@ function rev_split_by_char(c, s) {
       var i$p = $$String.index_from(s, i, c);
       var s$p = $$String.sub(s, i, i$p - i | 0);
       return loop(i$p + 1 | 0, s$p === "" ? l : ({
-                      hd: s$p,
-                      tl: l
-                    }));
+              hd: s$p,
+              tl: l
+            }));
     }
     catch (raw_exn){
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.RE_EXN_ID === "Not_found") {
         return {
-                hd: $$String.sub(s, i, s.length - i | 0),
-                tl: l
-              };
+          hd: $$String.sub(s, i, s.length - i | 0),
+          tl: l
+        };
       }
       throw exn;
     }
@@ -98,9 +98,9 @@ function xsplit(delim, s) {
         var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.RE_EXN_ID === "Not_found") {
           return {
-                  hd: $$String.sub(s, 0, x),
-                  tl: l
-                };
+            hd: $$String.sub(s, 0, x),
+            tl: l
+          };
         }
         throw exn;
       }
@@ -110,9 +110,9 @@ function xsplit(delim, s) {
         tl: l
       };
       var l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
+          hd: "",
+          tl: l$1
+        }) : l$1;
       _x = i$p;
       _l = l$2;
       continue ;
@@ -134,10 +134,10 @@ Mt.from_pair_suites("String_test", {
         "mutliple switch",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: 9,
-                    _1: ff("4")
-                  };
+              TAG: "Eq",
+              _0: 9,
+              _1: ff("4")
+            };
           })
       ],
       tl: {
@@ -145,10 +145,10 @@ Mt.from_pair_suites("String_test", {
           "int switch",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 9,
-                      _1: gg(4)
-                    };
+                TAG: "Eq",
+                _0: 9,
+                _1: gg(4)
+              };
             })
         ],
         tl: {
@@ -156,10 +156,10 @@ Mt.from_pair_suites("String_test", {
             "escape_normal",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: "haha",
-                        _1: $$String.escaped("haha")
-                      };
+                  TAG: "Eq",
+                  _0: "haha",
+                  _1: $$String.escaped("haha")
+                };
               })
           ],
           tl: {
@@ -167,10 +167,10 @@ Mt.from_pair_suites("String_test", {
               "escape_bytes",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: Bytes.of_string("haha"),
-                          _1: Bytes.escaped(Bytes.of_string("haha"))
-                        };
+                    TAG: "Eq",
+                    _0: Bytes.of_string("haha"),
+                    _1: Bytes.escaped(Bytes.of_string("haha"))
+                  };
                 })
             ],
             tl: {
@@ -178,10 +178,10 @@ Mt.from_pair_suites("String_test", {
                 "escape_quote",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: "\\\"\\\"",
-                            _1: $$String.escaped("\"\"")
-                          };
+                      TAG: "Eq",
+                      _0: "\\\"\\\"",
+                      _1: $$String.escaped("\"\"")
+                    };
                   })
               ],
               tl: {
@@ -189,19 +189,19 @@ Mt.from_pair_suites("String_test", {
                   "rev_split_by_char",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: {
-                                hd: "",
-                                tl: {
-                                  hd: "bbbb",
-                                  tl: {
-                                    hd: "bbbb",
-                                    tl: /* [] */0
-                                  }
-                                }
-                              },
-                              _1: rev_split_by_char(/* 'a' */97, "bbbbabbbba")
-                            };
+                        TAG: "Eq",
+                        _0: {
+                          hd: "",
+                          tl: {
+                            hd: "bbbb",
+                            tl: {
+                              hd: "bbbb",
+                              tl: /* [] */0
+                            }
+                          }
+                        },
+                        _1: rev_split_by_char(/* 'a' */97, "bbbbabbbba")
+                      };
                     })
                 ],
                 tl: {
@@ -209,13 +209,13 @@ Mt.from_pair_suites("String_test", {
                     "File \"string_test.res\", line 86, characters 5-12",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: {
-                                  hd: "aaaa",
-                                  tl: /* [] */0
-                                },
-                                _1: rev_split_by_char(/* ',' */44, "aaaa")
-                              };
+                          TAG: "Eq",
+                          _0: {
+                            hd: "aaaa",
+                            tl: /* [] */0
+                          },
+                          _1: rev_split_by_char(/* ',' */44, "aaaa")
+                        };
                       })
                   ],
                   tl: {
@@ -223,19 +223,19 @@ Mt.from_pair_suites("String_test", {
                       "xsplit",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: {
-                                    hd: "a",
-                                    tl: {
-                                      hd: "b",
-                                      tl: {
-                                        hd: "c",
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  },
-                                  _1: xsplit(/* '.' */46, "a.b.c")
-                                };
+                            TAG: "Eq",
+                            _0: {
+                              hd: "a",
+                              tl: {
+                                hd: "b",
+                                tl: {
+                                  hd: "c",
+                                  tl: /* [] */0
+                                }
+                              }
+                            },
+                            _1: xsplit(/* '.' */46, "a.b.c")
+                          };
                         })
                     ],
                     tl: {
@@ -243,10 +243,10 @@ Mt.from_pair_suites("String_test", {
                         "split_empty",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: /* [] */0,
-                                    _1: Ext_string_test.split(undefined, "", /* '_' */95)
-                                  };
+                              TAG: "Eq",
+                              _0: /* [] */0,
+                              _1: Ext_string_test.split(undefined, "", /* '_' */95)
+                            };
                           })
                       ],
                       tl: {
@@ -254,13 +254,13 @@ Mt.from_pair_suites("String_test", {
                           "split_empty2",
                           (function (param) {
                               return {
-                                      TAG: "Eq",
-                                      _0: {
-                                        hd: "test_unsafe_obj_ffi_ppx.cmi",
-                                        tl: /* [] */0
-                                      },
-                                      _1: Ext_string_test.split(false, " test_unsafe_obj_ffi_ppx.cmi", /* ' ' */32)
-                                    };
+                                TAG: "Eq",
+                                _0: {
+                                  hd: "test_unsafe_obj_ffi_ppx.cmi",
+                                  tl: /* [] */0
+                                },
+                                _1: Ext_string_test.split(false, " test_unsafe_obj_ffi_ppx.cmi", /* ' ' */32)
+                              };
                             })
                         ],
                         tl: {
@@ -268,10 +268,10 @@ Mt.from_pair_suites("String_test", {
                             "rfind",
                             (function (param) {
                                 return {
-                                        TAG: "Eq",
-                                        _0: 7,
-                                        _1: Ext_string_test.rfind("__", "__index__js")
-                                      };
+                                  TAG: "Eq",
+                                  _0: 7,
+                                  _1: Ext_string_test.rfind("__", "__index__js")
+                                };
                               })
                           ],
                           tl: {
@@ -279,10 +279,10 @@ Mt.from_pair_suites("String_test", {
                               "rfind_2",
                               (function (param) {
                                   return {
-                                          TAG: "Eq",
-                                          _0: 0,
-                                          _1: Ext_string_test.rfind("__", "__index_js")
-                                        };
+                                    TAG: "Eq",
+                                    _0: 0,
+                                    _1: Ext_string_test.rfind("__", "__index_js")
+                                  };
                                 })
                             ],
                             tl: {
@@ -290,10 +290,10 @@ Mt.from_pair_suites("String_test", {
                                 "rfind_3",
                                 (function (param) {
                                     return {
-                                            TAG: "Eq",
-                                            _0: -1,
-                                            _1: Ext_string_test.rfind("__", "_index_js")
-                                          };
+                                      TAG: "Eq",
+                                      _0: -1,
+                                      _1: Ext_string_test.rfind("__", "_index_js")
+                                    };
                                   })
                               ],
                               tl: {
@@ -301,10 +301,10 @@ Mt.from_pair_suites("String_test", {
                                   "find",
                                   (function (param) {
                                       return {
-                                              TAG: "Eq",
-                                              _0: 0,
-                                              _1: Ext_string_test.find(undefined, "__", "__index__js")
-                                            };
+                                        TAG: "Eq",
+                                        _0: 0,
+                                        _1: Ext_string_test.find(undefined, "__", "__index__js")
+                                      };
                                     })
                                 ],
                                 tl: {
@@ -312,10 +312,10 @@ Mt.from_pair_suites("String_test", {
                                     "find_2",
                                     (function (param) {
                                         return {
-                                                TAG: "Eq",
-                                                _0: 6,
-                                                _1: Ext_string_test.find(undefined, "__", "_index__js")
-                                              };
+                                          TAG: "Eq",
+                                          _0: 6,
+                                          _1: Ext_string_test.find(undefined, "__", "_index__js")
+                                        };
                                       })
                                   ],
                                   tl: {
@@ -323,10 +323,10 @@ Mt.from_pair_suites("String_test", {
                                       "find_3",
                                       (function (param) {
                                           return {
-                                                  TAG: "Eq",
-                                                  _0: -1,
-                                                  _1: Ext_string_test.find(undefined, "__", "_index_js")
-                                                };
+                                            TAG: "Eq",
+                                            _0: -1,
+                                            _1: Ext_string_test.find(undefined, "__", "_index_js")
+                                          };
                                         })
                                     ],
                                     tl: {
@@ -334,10 +334,10 @@ Mt.from_pair_suites("String_test", {
                                         "of_char",
                                         (function (param) {
                                             return {
-                                                    TAG: "Eq",
-                                                    _0: String.fromCharCode(/* '0' */48),
-                                                    _1: "0"
-                                                  };
+                                              TAG: "Eq",
+                                              _0: String.fromCharCode(/* '0' */48),
+                                              _1: "0"
+                                            };
                                           })
                                       ],
                                       tl: {
@@ -345,19 +345,19 @@ Mt.from_pair_suites("String_test", {
                                           "of_chars",
                                           (function (param) {
                                               return {
-                                                      TAG: "Eq",
-                                                      _0: string_of_chars({
-                                                            hd: /* '0' */48,
-                                                            tl: {
-                                                              hd: /* '1' */49,
-                                                              tl: {
-                                                                hd: /* '2' */50,
-                                                                tl: /* [] */0
-                                                              }
-                                                            }
-                                                          }),
-                                                      _1: "012"
-                                                    };
+                                                TAG: "Eq",
+                                                _0: string_of_chars({
+                                                      hd: /* '0' */48,
+                                                      tl: {
+                                                        hd: /* '1' */49,
+                                                        tl: {
+                                                          hd: /* '2' */50,
+                                                          tl: /* [] */0
+                                                        }
+                                                      }
+                                                    }),
+                                                _1: "012"
+                                              };
                                             })
                                         ],
                                         tl: /* [] */0
diff --git a/jscomp/test/string_unicode_test.js b/jscomp/test/string_unicode_test.js
index 112e0cd7387..dae9934e58c 100644
--- a/jscomp/test/string_unicode_test.js
+++ b/jscomp/test/string_unicode_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/stringmatch_test.js b/jscomp/test/stringmatch_test.js
index becccea56e0..603557254e1 100644
--- a/jscomp/test/stringmatch_test.js
+++ b/jscomp/test/stringmatch_test.js
@@ -12,38 +12,38 @@ function tst01(s) {
 
 if (tst01("") !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          22,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      22,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst01("\x00\x00\x00\x03") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          23,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      23,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst01("\x00\x00\x00\x00\x00\x00\x00\x07") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          24,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      24,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function tst02(s) {
@@ -53,25 +53,25 @@ function tst02(s) {
       return 1;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "stringmatch_test.res",
-            33,
-            21
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "stringmatch_test.res",
+        33,
+        21
+      ],
+      Error: new Error()
+    };
   }
   if (len === 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "stringmatch_test.res",
-            35,
-            21
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "stringmatch_test.res",
+        35,
+        21
+      ],
+      Error: new Error()
+    };
   }
   if (s === "A") {
     return 2;
@@ -82,62 +82,62 @@ function tst02(s) {
 
 if (tst02("") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          42,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      42,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst02("A") !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      43,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst02("B") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      44,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst02("\x00\x00\x00\x00\x00\x00\x00\x07") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      45,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst02("\x00\x00\x00\x03") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      46,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function tst03(s) {
@@ -197,578 +197,578 @@ function tst03(s) {
 
 if (tst03("get_const") !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          131,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      131,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("set_congt") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          132,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      132,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("get_var") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          133,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      133,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("gat_ver") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          134,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      134,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("get_env") !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          135,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      135,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("get_env") !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          136,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      136,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("get_meth") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          137,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      137,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("met_geth") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          138,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      138,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("set_var") !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          139,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      139,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("sev_tar") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          140,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      140,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const") !== 5) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          141,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      141,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("ppa_const") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          142,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      142,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_var") !== 6) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      143,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_var") !== 6) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      144,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_env") !== 7) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          145,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      145,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("epp_anv") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      146,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_meth") !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          147,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      147,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("atp_meph") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      148,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const_const") !== 9) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      149,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const_const") !== 9) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          150,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      150,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const_var") !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          151,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      151,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("atp_consp_var") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          152,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      152,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const_env") !== 11) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          153,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      153,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_constne_v") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          154,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      154,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_const_meth") !== 12) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          155,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      155,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("spp_conat_meth") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          156,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      156,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_var_const") !== 13) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          157,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      157,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_va_rconst") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          158,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      158,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_env_const") !== 14) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      159,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_env_const") !== 14) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      160,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_meth_const") !== 15) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          161,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      161,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("app_teth_consm") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      162,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_app_const") !== 16) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          163,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      163,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("math_epp_const") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      164,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_app_var") !== 17) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      165,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_app_var") !== 17) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          166,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      166,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_app_env") !== 18) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          167,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      167,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("eeth_app_mnv") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          168,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      168,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_app_meth") !== 19) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          169,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      169,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("meth_apt_meph") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          170,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      170,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("send_const") !== 20) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          171,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      171,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("tend_conss") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          172,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      172,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("send_var") !== 21) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          173,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      173,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("serd_van") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          174,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      174,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("send_env") !== 22) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          175,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      175,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("sen_denv") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          176,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      176,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("send_meth") !== 23) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          177,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      177,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst03("tend_mesh") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      178,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function tst04(s) {
@@ -804,230 +804,230 @@ function tst04(s) {
 
 if (tst04("AAAAAAAA") !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          215,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      215,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAAAAAAAAAAA") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          216,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      216,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAAAAAAAAAAAAAAAAAAA") !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          217,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      217,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          218,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      218,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("BBBBBBBB") !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          219,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      219,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("BBBBBBBBBBBBBBBB") !== 5) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          220,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      220,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("BBBBBBBBBBBBBBBBBBBBBBBB") !== 6) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          221,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      221,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB") !== 7) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          222,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      222,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("CCCCCCCC") !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          223,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      223,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("CCCCCCCCCCCCCCCC") !== 9) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          224,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      224,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("CCCCCCCCCCCCCCCCCCCCCCCC") !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          225,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      225,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC") !== 11) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          226,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      226,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          227,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      227,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("DDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          228,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      228,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("DDDDDDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          229,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      229,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAADDDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          230,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      230,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAADDDDDDDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          231,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      231,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAADDDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          232,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      232,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst04("AAAAAAAAAAAAAAADDDD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          233,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      233,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function tst05(s) {
@@ -1065,266 +1065,266 @@ function tst05(s) {
 
 if (tst05("AAA") !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          272,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      272,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAA") !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          273,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      273,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAA") !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          274,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      274,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAA") !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          275,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      275,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAA") !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          276,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      276,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAAAAAAA") !== 5) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          277,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      277,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAAAAAAAAAAA") !== 6) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          278,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      278,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAAAAAAAAAAAAAAA") !== 7) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          279,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      279,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBB") !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          280,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      280,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBB") !== 9) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          281,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      281,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBBB") !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          282,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      282,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBBBB") !== 11) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          283,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      283,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBBBBB") !== 12) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          284,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      284,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          285,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      285,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          286,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      286,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          287,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      287,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          288,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      288,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("AAAAAAAD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          289,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      289,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          290,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      290,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          291,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      291,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBBBBD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          292,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      292,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst05("BBBBBBBD") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          293,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      293,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var s00 = "and";
@@ -1888,2222 +1888,2222 @@ function tst06(s) {
 
 if (tst06(s00) !== 0) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          582,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      582,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t00) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          583,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      583,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s01) !== 1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          584,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      584,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t01) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          585,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      585,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s02) !== 2) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          586,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      586,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t02) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          587,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      587,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s03) !== 3) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          588,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      588,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t03) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          589,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      589,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s04) !== 4) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          590,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      590,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t04) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          591,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      591,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s05) !== 5) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          592,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      592,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t05) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          593,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      593,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s06) !== 6) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          594,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      594,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t06) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          595,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      595,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s07) !== 7) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          596,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      596,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t07) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          597,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      597,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s08) !== 8) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          598,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      598,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t08) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          599,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      599,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s09) !== 9) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          600,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      600,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t09) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          601,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      601,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s10) !== 10) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          602,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      602,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t10) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          603,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      603,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s11) !== 11) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          604,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      604,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t11) !== 11) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          605,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      605,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s12) !== 12) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          606,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      606,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t12) !== 12) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          607,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      607,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s13) !== 13) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          608,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      608,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t13) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          609,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      609,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s14) !== 14) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          610,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      610,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t14) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          611,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      611,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s15) !== 15) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          612,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      612,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t15) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          613,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      613,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s16) !== 16) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          614,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      614,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t16) !== 16) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          615,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      615,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s17) !== 17) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          616,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      616,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t17) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          617,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      617,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s18) !== 18) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          618,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      618,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t18) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          619,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      619,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s19) !== 19) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          620,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      620,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t19) !== 19) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          621,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      621,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s20) !== 20) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          622,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      622,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t20) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          623,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      623,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s21) !== 21) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          624,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      624,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t21) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          625,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      625,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s22) !== 22) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          626,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      626,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t22) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          627,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      627,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s23) !== 23) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          628,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      628,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t23) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          629,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      629,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s24) !== 24) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          630,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      630,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t24) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          631,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      631,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s25) !== 25) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          632,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      632,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t25) !== 25) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          633,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      633,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s26) !== 26) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          634,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      634,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t26) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          635,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      635,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s27) !== 27) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          636,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      636,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t27) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          637,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      637,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s28) !== 28) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          638,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      638,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t28) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          639,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      639,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s29) !== 29) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          640,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      640,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t29) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          641,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      641,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s30) !== 30) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          642,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      642,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t30) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          643,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      643,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s31) !== 31) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          644,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      644,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t31) !== 31) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          645,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      645,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s32) !== 32) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          646,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      646,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t32) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          647,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      647,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s33) !== 33) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          648,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      648,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t33) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          649,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      649,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s34) !== 34) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          650,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      650,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t34) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          651,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      651,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s35) !== 35) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          652,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      652,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t35) !== 35) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          653,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      653,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s36) !== 36) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          654,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      654,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t36) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          655,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      655,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s37) !== 37) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          656,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      656,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t37) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          657,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      657,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s38) !== 38) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          658,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      658,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t38) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          659,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      659,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s39) !== 39) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          660,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      660,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t39) !== 39) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          661,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      661,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s40) !== 40) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          662,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      662,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t40) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          663,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      663,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s41) !== 41) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          664,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      664,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t41) !== 41) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          665,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      665,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s42) !== 42) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          666,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      666,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t42) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          667,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      667,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s43) !== 43) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          668,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      668,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t43) !== 43) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          669,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      669,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s44) !== 44) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          670,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      670,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t44) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          671,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      671,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s45) !== 45) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          672,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      672,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t45) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          673,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      673,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s46) !== 46) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          674,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      674,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t46) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          675,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      675,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s47) !== 47) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          676,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      676,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t47) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          677,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      677,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s48) !== 48) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          678,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      678,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t48) !== 48) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          679,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      679,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s49) !== 49) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          680,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      680,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t49) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          681,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      681,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s50) !== 50) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          682,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      682,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t50) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          683,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      683,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s51) !== 51) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          684,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      684,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t51) !== 51) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          685,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      685,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s52) !== 52) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          686,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      686,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t52) !== 52) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          687,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      687,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s53) !== 53) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          688,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      688,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t53) !== 53) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          689,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      689,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s54) !== 54) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          690,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      690,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t54) !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          691,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      691,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s55) !== 55) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          692,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      692,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t55) !== 55) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          693,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      693,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s56) !== 56) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          694,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      694,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t56) !== 56) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          695,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      695,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s57) !== 57) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          696,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      696,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t57) !== 57) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          697,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      697,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s58) !== 58) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          698,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      698,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t58) !== 58) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          699,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      699,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s59) !== 59) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          700,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      700,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t59) !== 59) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          701,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      701,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s60) !== 60) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          702,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      702,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t60) !== 60) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          703,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      703,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s61) !== 61) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          704,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      704,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t61) !== 61) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          705,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      705,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s62) !== 62) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          706,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      706,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t62) !== 62) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          707,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      707,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s63) !== 63) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          708,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      708,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t63) !== 63) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          709,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      709,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s64) !== 64) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          710,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      710,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t64) !== 64) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          711,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      711,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s65) !== 65) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          712,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      712,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t65) !== 65) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          713,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      713,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s66) !== 66) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          714,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      714,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t66) !== 66) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          715,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      715,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s67) !== 67) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          716,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      716,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t67) !== 67) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          717,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      717,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s68) !== 68) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          718,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      718,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t68) !== 68) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          719,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      719,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s69) !== 69) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          720,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      720,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t69) !== 69) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          721,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      721,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s70) !== 70) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          722,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      722,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t70) !== 70) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          723,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      723,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s71) !== 71) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          724,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      724,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t71) !== 71) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          725,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      725,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s72) !== 72) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          726,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      726,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t72) !== 72) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          727,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      727,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s73) !== 73) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          728,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      728,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t73) !== 73) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          729,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      729,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s74) !== 74) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          730,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      730,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t74) !== 74) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          731,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      731,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s75) !== 75) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          732,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      732,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t75) !== 75) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          733,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      733,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s76) !== 76) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          734,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      734,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t76) !== 76) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          735,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      735,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s77) !== 77) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          736,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      736,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t77) !== 77) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          737,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      737,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s78) !== 78) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          738,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      738,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t78) !== 78) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          739,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      739,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s79) !== 79) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          740,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      740,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t79) !== 79) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          741,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      741,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s80) !== 80) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          742,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      742,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t80) !== 80) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          743,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      743,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s81) !== 81) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          744,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      744,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t81) !== 81) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          745,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      745,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s82) !== 82) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          746,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      746,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t82) !== 82) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          747,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      747,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s83) !== 83) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          748,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      748,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t83) !== 83) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          749,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      749,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s84) !== 84) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          750,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      750,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t84) !== 84) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          751,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      751,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s85) !== 85) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          752,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      752,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t85) !== 85) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          753,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      753,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s86) !== 86) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          754,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      754,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t86) !== 86) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          755,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      755,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s87) !== 87) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          756,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      756,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t87) !== 87) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          757,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      757,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s88) !== 88) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          758,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      758,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t88) !== 88) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          759,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      759,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s89) !== 89) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          760,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      760,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t89) !== 89) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          761,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      761,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s90) !== 90) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          762,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      762,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t90) !== 90) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          763,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      763,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(s91) !== 91) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          764,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      764,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06(t91) !== 91) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          765,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      765,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (tst06("") !== -1) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          766,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "stringmatch_test.res",
+      766,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 exports.tst01 = tst01;
diff --git a/jscomp/test/switch_case_test.js b/jscomp/test/switch_case_test.js
index 230d6f7240e..2fc6955c001 100644
--- a/jscomp/test/switch_case_test.js
+++ b/jscomp/test/switch_case_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/tagged_template_test.js b/jscomp/test/tagged_template_test.js
index c66d9ceb08c..81fc8f67718 100644
--- a/jscomp/test/tagged_template_test.js
+++ b/jscomp/test/tagged_template_test.js
@@ -8,9 +8,9 @@ var Tagged_template_libJs = require("./tagged_template_lib.js");
 
 function sql(prim0, prim1) {
   return Caml_splice_call.spliceApply(Tagged_template_libJs.sql, [
-              prim0,
-              prim1
-            ]);
+        prim0,
+        prim1
+      ]);
 }
 
 var Pg = {
@@ -46,10 +46,10 @@ Mt.from_pair_suites("tagged templates", {
         "with externals, it should return a string with the correct interpolations",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: query,
-                    _1: "SELECT * FROM 'users' WHERE id = '5'"
-                  };
+              TAG: "Eq",
+              _0: query,
+              _1: "SELECT * FROM 'users' WHERE id = '5'"
+            };
           })
       ],
       tl: {
@@ -57,10 +57,10 @@ Mt.from_pair_suites("tagged templates", {
           "with module scoped externals, it should also return a string with the correct interpolations",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: queryWithModule,
-                      _1: "SELECT * FROM 'users' WHERE id = '5'"
-                    };
+                TAG: "Eq",
+                _0: queryWithModule,
+                _1: "SELECT * FROM 'users' WHERE id = '5'"
+              };
             })
         ],
         tl: {
@@ -68,10 +68,10 @@ Mt.from_pair_suites("tagged templates", {
             "with externals, it should return the result of the function",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: length,
-                        _1: 52
-                      };
+                  TAG: "Eq",
+                  _0: length,
+                  _1: 52
+                };
               })
           ],
           tl: {
@@ -79,10 +79,10 @@ Mt.from_pair_suites("tagged templates", {
               "with rescript function, it should return a string with the correct interpolations",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: res,
-                          _1: "| 5 * 10 = 50 |"
-                        };
+                    TAG: "Eq",
+                    _0: res,
+                    _1: "| 5 * 10 = 50 |"
+                  };
                 })
             ],
             tl: {
@@ -90,10 +90,10 @@ Mt.from_pair_suites("tagged templates", {
                 "a template literal tagged with json should generate a regular string interpolation for now",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: "some random " + "string",
-                            _1: "some random string"
-                          };
+                      TAG: "Eq",
+                      _0: "some random " + "string",
+                      _1: "some random string"
+                    };
                   })
               ],
               tl: /* [] */0
diff --git a/jscomp/test/tailcall_inline_test.js b/jscomp/test/tailcall_inline_test.js
index 491916a1abc..1353158616e 100644
--- a/jscomp/test/tailcall_inline_test.js
+++ b/jscomp/test/tailcall_inline_test.js
@@ -29,21 +29,21 @@ var suites_0 = [
   "acc",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: f(),
-              _1: [
-                0,
-                1,
-                3,
-                6,
-                10,
-                15,
-                21,
-                28,
-                36,
-                45
-              ]
-            };
+        TAG: "Eq",
+        _0: f(),
+        _1: [
+          0,
+          1,
+          3,
+          6,
+          10,
+          15,
+          21,
+          28,
+          36,
+          45
+        ]
+      };
     })
 ];
 
@@ -52,23 +52,23 @@ var suites_1 = {
     "array_to_list",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: {
-                  hd: 1,
-                  tl: {
-                    hd: 2,
-                    tl: {
-                      hd: 3,
-                      tl: /* [] */0
-                    }
-                  }
-                },
-                _1: $$Array.to_list([
-                      1,
-                      2,
-                      3
-                    ])
-              };
+          TAG: "Eq",
+          _0: {
+            hd: 1,
+            tl: {
+              hd: 2,
+              tl: {
+                hd: 3,
+                tl: /* [] */0
+              }
+            }
+          },
+          _1: $$Array.to_list([
+                1,
+                2,
+                3
+              ])
+        };
       })
   ],
   tl: /* [] */0
diff --git a/jscomp/test/test_array_primitive.js b/jscomp/test/test_array_primitive.js
index ac0913d3128..edaa113bc50 100644
--- a/jscomp/test/test_array_primitive.js
+++ b/jscomp/test/test_array_primitive.js
@@ -14,10 +14,10 @@ function caml_array_sub(x, offset, len) {
 function caml_array_set(xs, index, newval) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   Caml_array.set(xs, index, newval);
 }
@@ -25,10 +25,10 @@ function caml_array_set(xs, index, newval) {
 function caml_array_get(xs, index) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return Caml_array.get(xs, index);
 }
diff --git a/jscomp/test/test_bool_equal.js b/jscomp/test/test_bool_equal.js
index cc6a99be6cb..fea96ab95aa 100644
--- a/jscomp/test/test_bool_equal.js
+++ b/jscomp/test/test_bool_equal.js
@@ -19,47 +19,47 @@ function bool_equal(x, y) {
 function assertions(param) {
   if (!bool_equal(true, true)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            16,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "test_bool_equal.res",
+        16,
+        2
+      ],
+      Error: new Error()
+    };
   }
   if (!bool_equal(false, false)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            17,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "test_bool_equal.res",
+        17,
+        2
+      ],
+      Error: new Error()
+    };
   }
   if (bool_equal(true, false)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            18,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "test_bool_equal.res",
+        18,
+        2
+      ],
+      Error: new Error()
+    };
   }
   if (bool_equal(false, true)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            19,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "test_bool_equal.res",
+        19,
+        2
+      ],
+      Error: new Error()
+    };
   }
   
 }
diff --git a/jscomp/test/test_bs_this.js b/jscomp/test/test_bs_this.js
index e699bfe4993..0551e666ee9 100644
--- a/jscomp/test/test_bs_this.js
+++ b/jscomp/test/test_bs_this.js
@@ -41,9 +41,9 @@ function f(x) {
       console.log(o);
     });
   return Curry._2(x.addEventListener, "onload", (function () {
-                var o = this ;
-                console.log(o.response);
-              }));
+          var o = this ;
+          console.log(o.response);
+        }));
 }
 
 function u(x) {
diff --git a/jscomp/test/test_closure.js b/jscomp/test/test_closure.js
index a9d1b9d69f4..848e9bec567 100644
--- a/jscomp/test/test_closure.js
+++ b/jscomp/test/test_closure.js
@@ -31,14 +31,14 @@ $$Array.iter((function (x) {
 
 if (v.contents !== 45) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_closure.res",
-          52,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "test_closure.res",
+      52,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 exports.v = v;
diff --git a/jscomp/test/test_demo.js b/jscomp/test/test_demo.js
index ab0151cbfa1..bfdec105f31 100644
--- a/jscomp/test/test_demo.js
+++ b/jscomp/test/test_demo.js
@@ -14,10 +14,10 @@ function fib(x) {
 
 function cons(x, y) {
   return {
-          TAG: "Cons",
-          _0: x,
-          _1: y
-        };
+    TAG: "Cons",
+    _0: x,
+    _1: y
+  };
 }
 
 function map(f, x) {
@@ -25,10 +25,10 @@ function map(f, x) {
     return "Nil";
   } else {
     return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
+      TAG: "Cons",
+      _0: Curry._1(f, x._0),
+      _1: map(f, x._1)
+    };
   }
 }
 
diff --git a/jscomp/test/test_exception.js b/jscomp/test/test_exception.js
index 106d3e9d364..13739f224f7 100644
--- a/jscomp/test/test_exception.js
+++ b/jscomp/test/test_exception.js
@@ -8,40 +8,40 @@ var Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local");
 
 function f(param) {
   throw {
-        RE_EXN_ID: Local,
-        _1: 3,
-        Error: new Error()
-      };
+    RE_EXN_ID: Local,
+    _1: 3,
+    Error: new Error()
+  };
 }
 
 function g(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function h(param) {
   throw {
-        RE_EXN_ID: Test_common.U,
-        _1: 3,
-        Error: new Error()
-      };
+    RE_EXN_ID: Test_common.U,
+    _1: 3,
+    Error: new Error()
+  };
 }
 
 function x(param) {
   throw {
-        RE_EXN_ID: Test_common.H,
-        Error: new Error()
-      };
+    RE_EXN_ID: Test_common.H,
+    Error: new Error()
+  };
 }
 
 function xx(param) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "x",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "x",
+    Error: new Error()
+  };
 }
 
 var Nullary = /* @__PURE__ */Caml_exceptions.create("Test_exception.Nullary");
diff --git a/jscomp/test/test_exception_escape.js b/jscomp/test/test_exception_escape.js
index 23d380f7d75..d6c908ff8c2 100644
--- a/jscomp/test/test_exception_escape.js
+++ b/jscomp/test/test_exception_escape.js
@@ -9,10 +9,10 @@ var f;
 
 try {
   throw {
-        RE_EXN_ID: A,
-        _1: 3,
-        Error: new Error()
-      };
+    RE_EXN_ID: A,
+    _1: 3,
+    Error: new Error()
+  };
 }
 catch (exn){
   f = 3;
diff --git a/jscomp/test/test_fib.js b/jscomp/test/test_fib.js
index 9bf0ba6e48e..66ca9dcf250 100644
--- a/jscomp/test/test_fib.js
+++ b/jscomp/test/test_fib.js
@@ -37,10 +37,10 @@ var sumdown = v$1;
 
 function cons(x, y) {
   return {
-          TAG: "Cons",
-          _0: x,
-          _1: y
-        };
+    TAG: "Cons",
+    _0: x,
+    _1: y
+  };
 }
 
 function length(x) {
@@ -56,10 +56,10 @@ function map(f, x) {
     return "Nil";
   } else {
     return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
+      TAG: "Cons",
+      _0: Curry._1(f, x._0),
+      _1: map(f, x._1)
+    };
   }
 }
 
diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js
index b4f801e4955..11c3f54b3fe 100644
--- a/jscomp/test/test_for_map.js
+++ b/jscomp/test/test_for_map.js
@@ -17,24 +17,24 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    d: d,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -45,10 +45,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -61,27 +61,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -94,10 +94,10 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function is_empty(param) {
@@ -111,13 +111,13 @@ function is_empty(param) {
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -129,13 +129,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -159,9 +159,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.int_compare(x, param.v);
     if (c === 0) {
@@ -177,9 +177,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -192,9 +192,9 @@ function find_first(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -229,9 +229,9 @@ function find_first_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -254,9 +254,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -269,9 +269,9 @@ function find_last(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -306,9 +306,9 @@ function find_last_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -361,16 +361,16 @@ function min_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -386,9 +386,9 @@ function min_binding_opt(_param) {
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -400,16 +400,16 @@ function max_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -425,9 +425,9 @@ function max_binding_opt(_param) {
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -437,10 +437,10 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -494,13 +494,13 @@ function update(x, f, param) {
     var data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: "Empty",
+        h: 1
+      };
     } else {
       return "Empty";
     }
@@ -520,13 +520,13 @@ function update(x, f, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -566,13 +566,13 @@ function map(f, param) {
   var d$p = Curry._1(f, param.d);
   var r$p = map(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -584,13 +584,13 @@ function mapi(f, param) {
   var d$p = Curry._2(f, v, param.d);
   var r$p = mapi(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -696,10 +696,10 @@ function concat_or_join(t1, v, d, t2) {
 function split(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
+      "Empty",
+      undefined,
+      "Empty"
+    ];
   }
   var r = param.r;
   var d = param.d;
@@ -708,25 +708,25 @@ function split(x, param) {
   var c = Caml.int_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, d, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge$1(f, s1, s2) {
@@ -745,14 +745,14 @@ function merge$1(f, s1, s2) {
   }
   if (typeof s2 !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "map.res",
+        552,
+        11
+      ],
+      Error: new Error()
+    };
   }
   var v2 = s2.v;
   var match$1 = split(v2, s1);
@@ -817,9 +817,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var d = param.d;
   var v = param.v;
@@ -832,14 +832,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, d, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, d, rf)
+    ];
   }
 }
 
diff --git a/jscomp/test/test_generative_module.js b/jscomp/test/test_generative_module.js
index e48fb05855f..07ca4a688a3 100644
--- a/jscomp/test/test_generative_module.js
+++ b/jscomp/test/test_generative_module.js
@@ -4,8 +4,8 @@
 
 function M($star) {
   return {
-          v: 3
-        };
+    v: 3
+  };
 }
 
 var V = {
diff --git a/jscomp/test/test_include.js b/jscomp/test/test_include.js
index 65938e3dcf2..03969ae6184 100644
--- a/jscomp/test/test_include.js
+++ b/jscomp/test/test_include.js
@@ -8,9 +8,9 @@ var Test_order = require("./test_order.js");
 function Make(U) {
   var compare = U.compare;
   return {
-          compare: compare,
-          v: compare
-        };
+    compare: compare,
+    v: compare
+  };
 }
 
 var X = {
diff --git a/jscomp/test/test_incomplete.js b/jscomp/test/test_incomplete.js
index d9a2d214597..4d23ddddf04 100644
--- a/jscomp/test/test_incomplete.js
+++ b/jscomp/test/test_incomplete.js
@@ -7,14 +7,14 @@ function f(x) {
     return /* 'a' */97;
   }
   throw {
-        RE_EXN_ID: "Match_failure",
-        _1: [
-          "test_incomplete.res",
-          3,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Match_failure",
+    _1: [
+      "test_incomplete.res",
+      3,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function f2(x) {
diff --git a/jscomp/test/test_int_map_find.js b/jscomp/test/test_int_map_find.js
index 44bcc8a15da..218099ab772 100644
--- a/jscomp/test/test_int_map_find.js
+++ b/jscomp/test/test_int_map_find.js
@@ -16,13 +16,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -33,10 +33,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -49,27 +49,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -82,22 +82,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -109,13 +109,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
diff --git a/jscomp/test/test_list.js b/jscomp/test/test_list.js
index 6aa3f677180..88a663e7043 100644
--- a/jscomp/test/test_list.js
+++ b/jscomp/test/test_list.js
@@ -28,10 +28,10 @@ function hd(x) {
     return x.hd;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "hd",
+    Error: new Error()
+  };
 }
 
 function tl(x) {
@@ -39,19 +39,19 @@ function tl(x) {
     return x.tl;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "tl",
+    Error: new Error()
+  };
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -67,10 +67,10 @@ function nth(l, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "nth",
+      Error: new Error()
+    };
   };
 }
 
@@ -108,9 +108,9 @@ function map(f, x) {
   }
   var r = Curry._1(f, x.hd);
   return {
-          hd: r,
-          tl: map(f, x.tl)
-        };
+    hd: r,
+    tl: map(f, x.tl)
+  };
 }
 
 function mapi(i, f, x) {
@@ -119,9 +119,9 @@ function mapi(i, f, x) {
   }
   var r = Curry._2(f, i, x.hd);
   return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, x.tl)
-        };
+    hd: r,
+    tl: mapi(i + 1 | 0, f, x.tl)
+  };
 }
 
 function mapi$1(f, l) {
@@ -200,24 +200,24 @@ function map2(f, l1, l2) {
     if (l2) {
       var r = Curry._2(f, l1.hd, l2.hd);
       return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
+        hd: r,
+        tl: map2(f, l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2",
+    Error: new Error()
+  };
 }
 
 function rev_map2(f, l1, l2) {
@@ -239,17 +239,17 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     if (l2$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -267,19 +267,19 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.iter2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.iter2",
+      Error: new Error()
+    };
   };
 }
 
@@ -296,17 +296,17 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     if (l2) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -318,17 +318,17 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -375,19 +375,19 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.for_all2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return true;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.for_all2",
+      Error: new Error()
+    };
   };
 }
 
@@ -405,19 +405,19 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.exists2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return false;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.exists2",
+      Error: new Error()
+    };
   };
 }
 
@@ -461,9 +461,9 @@ function assoc(x, _x_) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -479,9 +479,9 @@ function assq(x, _x_) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -523,9 +523,9 @@ function remove_assoc(x, x_) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -539,9 +539,9 @@ function remove_assq(x, x_) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -557,9 +557,9 @@ function find(p, _x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -599,9 +599,9 @@ function partition(p, l) {
     var yes = _yes;
     if (!x) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     var l$1 = x.tl;
     var x$1 = x.hd;
@@ -625,49 +625,49 @@ function partition(p, l) {
 function split(x) {
   if (!x) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = x.hd;
   var match$1 = split(x.tl);
   return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
+    {
+      hd: match[0],
+      tl: match$1[0]
+    },
+    {
+      hd: match[1],
+      tl: match$1[1]
+    }
+  ];
 }
 
 function combine(l1, l2) {
   if (l1) {
     if (l2) {
       return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
+        hd: [
+          l1.hd,
+          l2.hd
+        ],
+        tl: combine(l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.combine",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.combine",
+    Error: new Error()
+  };
 }
 
 function merge(cmp, l1, l2) {
@@ -681,14 +681,14 @@ function merge(cmp, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(cmp, h1, h2) <= 0) {
     return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(cmp, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(cmp, l1, l2.tl)
+    };
   }
 }
 
@@ -705,14 +705,14 @@ function chop(_k, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_list.res",
-            343,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "test_list.res",
+        343,
+        11
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -730,71 +730,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) <= 0) {
               if (Curry._2(cmp, x2, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -809,20 +809,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) <= 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -876,71 +876,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) > 0) {
               if (Curry._2(cmp, x2, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -955,20 +955,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1033,136 +1033,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 < 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c < 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1178,25 +1178,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 < 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1264,136 +1264,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 > 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c > 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1409,25 +1409,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js
index 8e1ac999e14..9e5b0fda3cd 100644
--- a/jscomp/test/test_per.js
+++ b/jscomp/test/test_per.js
@@ -18,18 +18,18 @@ Caml_external_polyfill.resolve("register_named_value")("Pervasives.array_bound_e
 
 function failwith(s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function invalid_arg(s) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var Exit = /* @__PURE__ */Caml_exceptions.create("Test_per.Exit");
@@ -106,10 +106,10 @@ function $caret(s1, s2) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "char_of_int",
+      Error: new Error()
+    };
   }
   return n;
 }
@@ -130,10 +130,10 @@ function bool_of_string(x) {
         return true;
     default:
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "bool_of_string",
+        Error: new Error()
+      };
   }
 }
 
@@ -172,9 +172,9 @@ function string_of_float(f) {
 function $at(l1, l2) {
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: $at(l1.tl, l2)
+    };
   } else {
     return l2;
   }
@@ -186,34 +186,34 @@ function open_out_gen(mode, perm, name) {
 
 function open_out(name) {
   return open_out_gen({
-              hd: "Open_wronly",
-              tl: {
-                hd: "Open_creat",
-                tl: {
-                  hd: "Open_trunc",
-                  tl: {
-                    hd: "Open_text",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
+        hd: "Open_wronly",
+        tl: {
+          hd: "Open_creat",
+          tl: {
+            hd: "Open_trunc",
+            tl: {
+              hd: "Open_text",
+              tl: /* [] */0
+            }
+          }
+        }
+      }, 438, name);
 }
 
 function open_out_bin(name) {
   return open_out_gen({
-              hd: "Open_wronly",
-              tl: {
-                hd: "Open_creat",
-                tl: {
-                  hd: "Open_trunc",
-                  tl: {
-                    hd: "Open_binary",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
+        hd: "Open_wronly",
+        tl: {
+          hd: "Open_creat",
+          tl: {
+            hd: "Open_trunc",
+            tl: {
+              hd: "Open_binary",
+              tl: /* [] */0
+            }
+          }
+        }
+      }, 438, name);
 }
 
 function flush_all(param) {
@@ -245,10 +245,10 @@ function output_string(oc, s) {
 function output(oc, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "output",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "output",
+      Error: new Error()
+    };
   }
   Caml_external_polyfill.resolve("ml_output")(oc, s, ofs, len);
 }
@@ -256,10 +256,10 @@ function output(oc, s, ofs, len) {
 function output_substring(oc, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "output_substring",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "output_substring",
+      Error: new Error()
+    };
   }
   Caml_external_polyfill.resolve("ml_output")(oc, s, ofs, len);
 }
@@ -294,31 +294,31 @@ function open_in_gen(mode, perm, name) {
 
 function open_in(name) {
   return open_in_gen({
-              hd: "Open_rdonly",
-              tl: {
-                hd: "Open_text",
-                tl: /* [] */0
-              }
-            }, 0, name);
+        hd: "Open_rdonly",
+        tl: {
+          hd: "Open_text",
+          tl: /* [] */0
+        }
+      }, 0, name);
 }
 
 function open_in_bin(name) {
   return open_in_gen({
-              hd: "Open_rdonly",
-              tl: {
-                hd: "Open_binary",
-                tl: /* [] */0
-              }
-            }, 0, name);
+        hd: "Open_rdonly",
+        tl: {
+          hd: "Open_binary",
+          tl: /* [] */0
+        }
+      }, 0, name);
 }
 
 function input(ic, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "input",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "input",
+      Error: new Error()
+    };
   }
   return Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len);
 }
@@ -333,9 +333,9 @@ function unsafe_really_input(ic, s, _ofs, _len) {
     var r = Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len);
     if (r === 0) {
       throw {
-            RE_EXN_ID: "End_of_file",
-            Error: new Error()
-          };
+        RE_EXN_ID: "End_of_file",
+        Error: new Error()
+      };
     }
     _len = len - r | 0;
     _ofs = ofs + r | 0;
@@ -346,10 +346,10 @@ function unsafe_really_input(ic, s, _ofs, _len) {
 function really_input(ic, s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "really_input",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "really_input",
+      Error: new Error()
+    };
   }
   unsafe_really_input(ic, s, ofs, len);
 }
@@ -387,9 +387,9 @@ function input_line(chan) {
         return build_result(Caml_bytes.create(len), len, accu);
       }
       throw {
-            RE_EXN_ID: "End_of_file",
-            Error: new Error()
-          };
+        RE_EXN_ID: "End_of_file",
+        Error: new Error()
+      };
     }
     if (n > 0) {
       var res = Caml_bytes.create(n - 1 | 0);
@@ -400,9 +400,9 @@ function input_line(chan) {
       }
       var len$1 = (len + n | 0) - 1 | 0;
       return build_result(Caml_bytes.create(len$1), len$1, {
-                  hd: res,
-                  tl: accu
-                });
+            hd: res,
+            tl: accu
+          });
     }
     var beg = Caml_bytes.create(-n | 0);
     Caml_external_polyfill.resolve("ml_input")(chan, beg, 0, -n | 0);
diff --git a/jscomp/test/test_primitive.js b/jscomp/test/test_primitive.js
index a66ce82af39..b2aa55886e4 100644
--- a/jscomp/test/test_primitive.js
+++ b/jscomp/test/test_primitive.js
@@ -8,28 +8,28 @@ var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
 
 function a4(prim) {
   return [
-          "File \"test_primitive.res\", line 29, characters 9-19",
-          prim
-        ];
+    "File \"test_primitive.res\", line 29, characters 9-19",
+    prim
+  ];
 }
 
 function a5(prim) {
   return [
-          30,
-          prim
-        ];
+    30,
+    prim
+  ];
 }
 
 function a6(prim) {
   return [
-          [
-            "test_primitive.res",
-            31,
-            9,
-            19
-          ],
-          prim
-        ];
+    [
+      "test_primitive.res",
+      31,
+      9,
+      19
+    ],
+    prim
+  ];
 }
 
 var test_float = 3;
diff --git a/jscomp/test/test_react.js b/jscomp/test/test_react.js
index ffc39f072fb..fccccc31439 100644
--- a/jscomp/test/test_react.js
+++ b/jscomp/test/test_react.js
@@ -13,8 +13,8 @@ console.log(32);
 ReactDom.render(React.createClass({
           render: (function (param) {
               return React.DOM.div({
-                          alt: "pic"
-                        }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"), React.DOM.h3(undefined, "type safe!"));
+                    alt: "pic"
+                  }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"), React.DOM.h3(undefined, "type safe!"));
             })
         }), document.getElementById("hi"));
 
diff --git a/jscomp/test/test_runtime_encoding.js b/jscomp/test/test_runtime_encoding.js
index bbc132b4b3b..d2339abd756 100644
--- a/jscomp/test/test_runtime_encoding.js
+++ b/jscomp/test/test_runtime_encoding.js
@@ -5,23 +5,23 @@ var Caml_array = require("../../lib/js/caml_array.js");
 
 function g(x) {
   return [
-          3,
-          x
-        ];
+    3,
+    x
+  ];
 }
 
 function ff(v, u) {
   return {
-          v: v,
-          u: u
-        };
+    v: v,
+    u: u
+  };
 }
 
 function fff(vv, uu) {
   return {
-          vv: vv,
-          uu: uu
-        };
+    vv: vv,
+    uu: uu
+  };
 }
 
 function a(x) {
diff --git a/jscomp/test/test_seq.js b/jscomp/test/test_seq.js
index 2c9252d100d..dae5da94d39 100644
--- a/jscomp/test/test_seq.js
+++ b/jscomp/test/test_seq.js
@@ -25,21 +25,21 @@ function assoc3(x, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
 function help_action(param) {
   throw {
-        RE_EXN_ID: Stop,
-        _1: {
-          TAG: "Unknown",
-          _0: "-help"
-        },
-        Error: new Error()
-      };
+    RE_EXN_ID: Stop,
+    _1: {
+      TAG: "Unknown",
+      _0: "-help"
+    },
+    Error: new Error()
+  };
 }
 
 function v(speclist) {
diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js
index 8c591e29c05..706ef72952f 100644
--- a/jscomp/test/test_set.js
+++ b/jscomp/test/test_set.js
@@ -18,12 +18,12 @@ function Make(Ord) {
     var hr;
     hr = typeof r !== "object" ? 0 : r._3;
     return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      _0: l,
+      _1: v,
+      _2: r,
+      _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var bal = function (l, v, r) {
     var hl;
@@ -33,10 +33,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       }
       var lr = l._2;
       var lv = l._1;
@@ -48,26 +48,26 @@ function Make(Ord) {
         return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              _0: l,
-              _1: v,
-              _2: r,
-              _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        _0: l,
+        _1: v,
+        _2: r,
+        _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var rr = r._2;
     var rv = r._1;
@@ -79,20 +79,20 @@ function Make(Ord) {
       return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   };
   var add = function (x, x_) {
     if (typeof x_ !== "object") {
       return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x,
-              _2: "Empty",
-              _3: 1
-            };
+        TAG: "Node",
+        _0: "Empty",
+        _1: x,
+        _2: "Empty",
+        _3: 1
+      };
     }
     var r = x_._2;
     var v = x_._1;
@@ -108,12 +108,12 @@ function Make(Ord) {
   };
   var singleton = function (x) {
     return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
+      TAG: "Node",
+      _0: "Empty",
+      _1: x,
+      _2: "Empty",
+      _3: 1
+    };
   };
   var add_min_element = function (v, x) {
     if (typeof x !== "object") {
@@ -151,9 +151,9 @@ function Make(Ord) {
       var x = _x;
       if (typeof x !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = x._0;
       if (typeof l !== "object") {
@@ -168,9 +168,9 @@ function Make(Ord) {
       var x = _x;
       if (typeof x !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = x._2;
       if (typeof r !== "object") {
@@ -183,10 +183,10 @@ function Make(Ord) {
   var remove_min_elt = function (x) {
     if (typeof x !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = x._0;
     if (typeof l !== "object") {
@@ -216,10 +216,10 @@ function Make(Ord) {
   var split = function (x, x_) {
     if (typeof x_ !== "object") {
       return [
-              "Empty",
-              false,
-              "Empty"
-            ];
+        "Empty",
+        false,
+        "Empty"
+      ];
     }
     var r = x_._2;
     var v = x_._1;
@@ -227,25 +227,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var is_empty = function (x) {
     if (typeof x !== "object") {
@@ -513,9 +513,9 @@ function Make(Ord) {
   var partition = function (p, x) {
     if (typeof x !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var v = x._1;
     var match = partition(p, x._0);
@@ -527,14 +527,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pv) {
       return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, rf)
+      ];
     }
   };
   var cardinal = function (x) {
@@ -567,9 +567,9 @@ function Make(Ord) {
       var x_ = _x_;
       if (typeof x_ !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = x_._1;
       var c = Curry._2(Ord.compare, x, v);
@@ -585,21 +585,21 @@ function Make(Ord) {
       switch (n) {
         case 0 :
             return [
-                    "Empty",
-                    l
-                  ];
+              "Empty",
+              l
+            ];
         case 1 :
             if (l) {
               return [
-                      {
-                        TAG: "Node",
-                        _0: "Empty",
-                        _1: l.hd,
-                        _2: "Empty",
-                        _3: 1
-                      },
-                      l.tl
-                    ];
+                {
+                  TAG: "Node",
+                  _0: "Empty",
+                  _1: l.hd,
+                  _2: "Empty",
+                  _3: 1
+                },
+                l.tl
+              ];
             }
             break;
         case 2 :
@@ -607,21 +607,21 @@ function Make(Ord) {
               var match = l.tl;
               if (match) {
                 return [
-                        {
-                          TAG: "Node",
-                          _0: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: l.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _1: match.hd,
-                          _2: "Empty",
-                          _3: 2
-                        },
-                        match.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    _0: {
+                      TAG: "Node",
+                      _0: "Empty",
+                      _1: l.hd,
+                      _2: "Empty",
+                      _3: 1
+                    },
+                    _1: match.hd,
+                    _2: "Empty",
+                    _3: 2
+                  },
+                  match.tl
+                ];
               }
               
             }
@@ -633,27 +633,27 @@ function Make(Ord) {
                 var match$2 = match$1.tl;
                 if (match$2) {
                   return [
-                          {
-                            TAG: "Node",
-                            _0: {
-                              TAG: "Node",
-                              _0: "Empty",
-                              _1: l.hd,
-                              _2: "Empty",
-                              _3: 1
-                            },
-                            _1: match$1.hd,
-                            _2: {
-                              TAG: "Node",
-                              _0: "Empty",
-                              _1: match$2.hd,
-                              _2: "Empty",
-                              _3: 1
-                            },
-                            _3: 2
-                          },
-                          match$2.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      _0: {
+                        TAG: "Node",
+                        _0: "Empty",
+                        _1: l.hd,
+                        _2: "Empty",
+                        _3: 1
+                      },
+                      _1: match$1.hd,
+                      _2: {
+                        TAG: "Node",
+                        _0: "Empty",
+                        _1: match$2.hd,
+                        _2: "Empty",
+                        _3: 1
+                      },
+                      _3: 2
+                    },
+                    match$2.tl
+                  ];
                 }
                 
               }
@@ -669,19 +669,19 @@ function Make(Ord) {
       if (l$1) {
         var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
         return [
-                create(match$3[0], l$1.hd, match$4[0]),
-                match$4[1]
-              ];
+          create(match$3[0], l$1.hd, match$4[0]),
+          match$4[1]
+        ];
       }
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_set.res",
-              497,
-              20
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "test_set.res",
+          497,
+          20
+        ],
+        Error: new Error()
+      };
     };
     return sub(List.length(l), l)[0];
   };
@@ -717,46 +717,46 @@ function Make(Ord) {
     }
   };
   return {
-          height: height,
-          create: create,
-          bal: bal,
-          add: add,
-          singleton: singleton,
-          add_min_element: add_min_element,
-          add_max_element: add_max_element,
-          join: join,
-          min_elt: min_elt,
-          max_elt: max_elt,
-          remove_min_elt: remove_min_elt,
-          merge: merge,
-          concat: concat,
-          split: split,
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          cons_enum: cons_enum,
-          compare_aux: compare_aux,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements_aux: elements_aux,
-          elements: elements,
-          choose: min_elt,
-          find: find,
-          of_sorted_list: of_sorted_list,
-          of_list: of_list
-        };
+    height: height,
+    create: create,
+    bal: bal,
+    add: add,
+    singleton: singleton,
+    add_min_element: add_min_element,
+    add_max_element: add_max_element,
+    join: join,
+    min_elt: min_elt,
+    max_elt: max_elt,
+    remove_min_elt: remove_min_elt,
+    merge: merge,
+    concat: concat,
+    split: split,
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    remove: remove,
+    union: union,
+    inter: inter,
+    diff: diff,
+    cons_enum: cons_enum,
+    compare_aux: compare_aux,
+    compare: compare,
+    equal: equal,
+    subset: subset,
+    iter: iter,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    elements_aux: elements_aux,
+    elements: elements,
+    choose: min_elt,
+    find: find,
+    of_sorted_list: of_sorted_list,
+    of_list: of_list
+  };
 }
 
 var N = {
diff --git a/jscomp/test/test_string.js b/jscomp/test/test_string.js
index 301f0341f10..f5365941dec 100644
--- a/jscomp/test/test_string.js
+++ b/jscomp/test/test_string.js
@@ -12,14 +12,14 @@ function f(x) {
         return 1;
     default:
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_string.res",
-              5,
-              17
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "test_string.res",
+          5,
+          17
+        ],
+        Error: new Error()
+      };
   }
 }
 
diff --git a/jscomp/test/test_string_case.js b/jscomp/test/test_string_case.js
index 617b1d12606..306e9cf8d63 100644
--- a/jscomp/test/test_string_case.js
+++ b/jscomp/test/test_string_case.js
@@ -10,14 +10,14 @@ function f(x) {
         return 1;
     default:
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_string_case.res",
-              5,
-              9
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "test_string_case.res",
+          5,
+          9
+        ],
+        Error: new Error()
+      };
   }
 }
 
diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js
index b74952007f8..015f7ec46db 100644
--- a/jscomp/test/test_string_map.js
+++ b/jscomp/test/test_string_map.js
@@ -16,13 +16,13 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, x, d, r) {
@@ -33,10 +33,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -49,27 +49,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -82,22 +82,22 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -109,13 +109,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -139,9 +139,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml.string_compare(x, param.v);
     if (c === 0) {
diff --git a/jscomp/test/test_switch.js b/jscomp/test/test_switch.js
index 5c53c83900e..b75cafd1d47 100644
--- a/jscomp/test/test_switch.js
+++ b/jscomp/test/test_switch.js
@@ -27,9 +27,9 @@ function f(x) {
 function bind(x, f) {
   if (x.TAG === "Left") {
     return {
-            TAG: "Left",
-            _0: Curry._1(f, x._0)
-          };
+      TAG: "Left",
+      _0: Curry._1(f, x._0)
+    };
   } else {
     return x;
   }
diff --git a/jscomp/test/test_trywith.js b/jscomp/test/test_trywith.js
index 1f55a1f5230..01077ef66ae 100644
--- a/jscomp/test/test_trywith.js
+++ b/jscomp/test/test_trywith.js
@@ -118,9 +118,9 @@ function ff(g, x) {
 
 function u(param) {
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function f(x) {
@@ -131,14 +131,14 @@ function f(x) {
     return 1;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_trywith.res",
-          59,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "test_trywith.res",
+      59,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 var u1 = "bad character decimal encoding \\";
diff --git a/jscomp/test/test_unsafe_cmp.js b/jscomp/test/test_unsafe_cmp.js
index 790a2922f1e..d57878aeb46 100644
--- a/jscomp/test/test_unsafe_cmp.js
+++ b/jscomp/test/test_unsafe_cmp.js
@@ -4,11 +4,11 @@
 
 function f(x, y) {
   return [
-          x < y,
-          x <= y,
-          x > y,
-          x >= y
-        ];
+    x < y,
+    x <= y,
+    x > y,
+    x >= y
+  ];
 }
 
 function ff(x, y) {
diff --git a/jscomp/test/test_unsupported_primitive.js b/jscomp/test/test_unsupported_primitive.js
index a6d27287b59..72e8ec738f9 100644
--- a/jscomp/test/test_unsupported_primitive.js
+++ b/jscomp/test/test_unsupported_primitive.js
@@ -6,10 +6,10 @@ var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
 function to_buffer(buff, ofs, len, v, flags) {
   if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.to_buffer: substring out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Marshal.to_buffer: substring out of bounds",
+      Error: new Error()
+    };
   }
   return Caml_external_polyfill.resolve("caml_output_value_to_buffer")(buff, ofs, len, v, flags);
 }
diff --git a/jscomp/test/test_while_closure.js b/jscomp/test/test_while_closure.js
index 430c53070d7..2a2e30074af 100644
--- a/jscomp/test/test_while_closure.js
+++ b/jscomp/test/test_while_closure.js
@@ -36,14 +36,14 @@ console.log(String(v.contents));
 
 if (v.contents !== 45) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_while_closure.res",
-          55,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "test_while_closure.res",
+      55,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var count = 10;
diff --git a/jscomp/test/test_zero_nullable.js b/jscomp/test/test_zero_nullable.js
index 346dcaae36b..e0c85479cdf 100644
--- a/jscomp/test/test_zero_nullable.js
+++ b/jscomp/test/test_zero_nullable.js
@@ -20,10 +20,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js
index 48e1a490bba..5309f884e9a 100644
--- a/jscomp/test/ticker.js
+++ b/jscomp/test/ticker.js
@@ -30,9 +30,9 @@ function split(delim, s) {
         var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.RE_EXN_ID === "Not_found") {
           return {
-                  hd: $$String.sub(s, 0, x),
-                  tl: l
-                };
+            hd: $$String.sub(s, 0, x),
+            tl: l
+          };
         }
         throw exn;
       }
@@ -42,9 +42,9 @@ function split(delim, s) {
         tl: l
       };
       var l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
+          hd: "",
+          tl: l$1
+        }) : l$1;
       _x = i$p;
       _l = l$2;
       continue ;
@@ -81,8 +81,8 @@ function string_of_rank(x) {
 
 function find_ticker_by_name(all_tickers, ticker) {
   return List.find((function (param) {
-                return param.ticker_name === ticker;
-              }), all_tickers);
+          return param.ticker_name === ticker;
+        }), all_tickers);
 }
 
 function print_all_composite(all_tickers) {
@@ -107,24 +107,24 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: x,
+    d: d,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function singleton(x, d) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    d: d,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function bal(l, x, d, r) {
@@ -135,10 +135,10 @@ function bal(l, x, d, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var ld = l.d;
@@ -151,27 +151,27 @@ function bal(l, x, d, r) {
       return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rd = r.d;
@@ -184,10 +184,10 @@ function bal(l, x, d, r) {
     return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Map.bal",
+    Error: new Error()
+  };
 }
 
 function is_empty(param) {
@@ -201,13 +201,13 @@ function is_empty(param) {
 function add(x, data, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: data,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var d = param.d;
@@ -219,13 +219,13 @@ function add(x, data, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -249,9 +249,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var c = Caml_obj.compare(x, param.v);
     if (c === 0) {
@@ -267,9 +267,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -282,9 +282,9 @@ function find_first(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -319,9 +319,9 @@ function find_first_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -344,9 +344,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -359,9 +359,9 @@ function find_last(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -396,9 +396,9 @@ function find_last_opt(f, _param) {
         var v0 = _v0;
         if (typeof param$1 !== "object") {
           return [
-                  v0,
-                  d0
-                ];
+            v0,
+            d0
+          ];
         }
         var v$1 = param$1.v;
         if (Curry._1(f, v$1)) {
@@ -451,16 +451,16 @@ function min_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -476,9 +476,9 @@ function min_binding_opt(_param) {
     var l = param.l;
     if (typeof l !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = l;
     continue ;
@@ -490,16 +490,16 @@ function max_binding(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -515,9 +515,9 @@ function max_binding_opt(_param) {
     var r = param.r;
     if (typeof r !== "object") {
       return [
-              param.v,
-              param.d
-            ];
+        param.v,
+        param.d
+      ];
     }
     _param = r;
     continue ;
@@ -527,10 +527,10 @@ function max_binding_opt(_param) {
 function remove_min_binding(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -584,13 +584,13 @@ function update(x, f, param) {
     var data = Curry._1(f, undefined);
     if (data !== undefined) {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: Caml_option.valFromOption(data),
+        r: "Empty",
+        h: 1
+      };
     } else {
       return "Empty";
     }
@@ -610,13 +610,13 @@ function update(x, f, param) {
       return param;
     } else {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: data$2,
+        r: r,
+        h: param.h
+      };
     }
   }
   if (c < 0) {
@@ -656,13 +656,13 @@ function map(f, param) {
   var d$p = Curry._1(f, param.d);
   var r$p = map(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: param.v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function mapi(f, param) {
@@ -674,13 +674,13 @@ function mapi(f, param) {
   var d$p = Curry._2(f, v, param.d);
   var r$p = mapi(f, param.r);
   return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
+    TAG: "Node",
+    l: l$p,
+    v: v,
+    d: d$p,
+    r: r$p,
+    h: param.h
+  };
 }
 
 function fold(f, _m, _accu) {
@@ -786,10 +786,10 @@ function concat_or_join(t1, v, d, t2) {
 function split$1(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
+      "Empty",
+      undefined,
+      "Empty"
+    ];
   }
   var r = param.r;
   var d = param.d;
@@ -798,25 +798,25 @@ function split$1(x, param) {
   var c = Caml_obj.compare(x, v);
   if (c === 0) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (c < 0) {
     var match = split$1(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, d, r)
+    ];
   }
   var match$1 = split$1(x, r);
   return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function merge$1(f, s1, s2) {
@@ -835,14 +835,14 @@ function merge$1(f, s1, s2) {
   }
   if (typeof s2 !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "map.res",
+        552,
+        11
+      ],
+      Error: new Error()
+    };
   }
   var v2 = s2.v;
   var match$1 = split$1(v2, s1);
@@ -907,9 +907,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var d = param.d;
   var v = param.v;
@@ -922,14 +922,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, d, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, d, rf)
+    ];
   }
 }
 
@@ -1114,9 +1114,9 @@ function compute_update_sequences(all_tickers) {
           var tmp = ticker.type_;
           if (typeof tmp !== "object") {
             return add(ticker.ticker_name, {
-                        hd: ticker,
-                        tl: /* [] */0
-                      }, map);
+                  hd: ticker,
+                  tl: /* [] */0
+                }, map);
           }
           var loop = function (_up, _map, _ticker) {
             while(true) {
@@ -1146,42 +1146,42 @@ function compute_update_sequences(all_tickers) {
           return loop(/* [] */0, map, ticker);
         }), "Empty", List.rev(all_tickers));
   return fold((function (k, l, map) {
-                var l$1 = List.sort_uniq((function (lhs, rhs) {
-                        var x = lhs.rank;
-                        if (typeof x !== "object") {
-                          if (x === "Uninitialized") {
-                            throw {
-                                  RE_EXN_ID: "Failure",
-                                  _1: "All nodes should be ranked",
-                                  Error: new Error()
-                                };
-                          }
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "All nodes should be ranked",
-                                Error: new Error()
-                              };
-                        } else {
-                          var y = rhs.rank;
-                          if (typeof y === "object") {
-                            return Caml.int_compare(x._0, y._0);
-                          }
-                          if (y === "Uninitialized") {
-                            throw {
-                                  RE_EXN_ID: "Failure",
-                                  _1: "All nodes should be ranked",
-                                  Error: new Error()
-                                };
-                          }
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "All nodes should be ranked",
-                                Error: new Error()
-                              };
-                        }
-                      }), l);
-                return add(k, l$1, map);
-              }), map, map);
+          var l$1 = List.sort_uniq((function (lhs, rhs) {
+                  var x = lhs.rank;
+                  if (typeof x !== "object") {
+                    if (x === "Uninitialized") {
+                      throw {
+                        RE_EXN_ID: "Failure",
+                        _1: "All nodes should be ranked",
+                        Error: new Error()
+                      };
+                    }
+                    throw {
+                      RE_EXN_ID: "Failure",
+                      _1: "All nodes should be ranked",
+                      Error: new Error()
+                    };
+                  } else {
+                    var y = rhs.rank;
+                    if (typeof y === "object") {
+                      return Caml.int_compare(x._0, y._0);
+                    }
+                    if (y === "Uninitialized") {
+                      throw {
+                        RE_EXN_ID: "Failure",
+                        _1: "All nodes should be ranked",
+                        Error: new Error()
+                      };
+                    }
+                    throw {
+                      RE_EXN_ID: "Failure",
+                      _1: "All nodes should be ranked",
+                      Error: new Error()
+                    };
+                  }
+                }), l);
+          return add(k, l$1, map);
+        }), map, map);
 }
 
 function process_quote(ticker_map, new_ticker, new_value) {
@@ -1194,10 +1194,10 @@ function process_quote(ticker_map, new_ticker, new_value) {
               return;
             }
             throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Only single Market ticker should be udpated upon a new quote",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Failure",
+              _1: "Only single Market ticker should be udpated upon a new quote",
+              Error: new Error()
+            };
           }
           var match$1 = match._0;
           var match$2 = match$1.lhs.value;
@@ -1214,18 +1214,18 @@ function process_input_line(ticker_map, all_tickers, line) {
     var lhs$1 = find_ticker_by_name(all_tickers, lhs);
     var rhs$1 = find_ticker_by_name(all_tickers, rhs);
     return {
-            value: undefined,
-            rank: "Uninitialized",
-            ticker_name: ticker_name,
-            type_: {
-              TAG: "Binary_op",
-              _0: {
-                op: op,
-                rhs: rhs$1,
-                lhs: lhs$1
-              }
-            }
-          };
+      value: undefined,
+      rank: "Uninitialized",
+      ticker_name: ticker_name,
+      type_: {
+        TAG: "Binary_op",
+        _0: {
+          op: op,
+          rhs: rhs$1,
+          lhs: lhs$1
+        }
+      }
+    };
   };
   var tokens = split(/* '|' */124, line);
   if (tokens) {
@@ -1237,30 +1237,30 @@ function process_input_line(ticker_map, all_tickers, line) {
             if (match$1) {
               if (match$1.tl) {
                 throw {
-                      RE_EXN_ID: "Failure",
-                      _1: "Invalid input line",
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: "Failure",
+                  _1: "Invalid input line",
+                  Error: new Error()
+                };
               }
               var ticker_map$1 = ticker_map !== undefined ? Caml_option.valFromOption(ticker_map) : compute_update_sequences(all_tickers);
               var value = Caml_format.float_of_string(match$1.hd);
               process_quote(ticker_map$1, match.hd, value);
               return [
-                      all_tickers,
-                      Caml_option.some(ticker_map$1)
-                    ];
+                all_tickers,
+                Caml_option.some(ticker_map$1)
+              ];
             }
             throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Invalid input line",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Failure",
+              _1: "Invalid input line",
+              Error: new Error()
+            };
           }
           throw {
-                RE_EXN_ID: "Failure",
-                _1: "Invalid input line",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Failure",
+            _1: "Invalid input line",
+            Error: new Error()
+          };
       case "R" :
           var match$2 = tokens.tl;
           if (match$2) {
@@ -1275,30 +1275,30 @@ function process_input_line(ticker_map, all_tickers, line) {
                       if (match$5) {
                         if (match$5.tl) {
                           throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "Invalid input line",
-                                Error: new Error()
-                              };
-                        }
-                        return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$4.hd, match$5.hd, "PLUS"),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
-                      }
-                      throw {
                             RE_EXN_ID: "Failure",
                             _1: "Invalid input line",
                             Error: new Error()
                           };
+                        }
+                        return [
+                          {
+                            hd: make_binary_op(ticker_name, match$4.hd, match$5.hd, "PLUS"),
+                            tl: all_tickers
+                          },
+                          ticker_map
+                        ];
+                      }
+                      throw {
+                        RE_EXN_ID: "Failure",
+                        _1: "Invalid input line",
+                        Error: new Error()
+                      };
                     }
                     throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Invalid input line",
-                          Error: new Error()
-                        };
+                      RE_EXN_ID: "Failure",
+                      _1: "Invalid input line",
+                      Error: new Error()
+                    };
                 case "-" :
                     var match$6 = match$3.tl;
                     if (match$6) {
@@ -1306,84 +1306,84 @@ function process_input_line(ticker_map, all_tickers, line) {
                       if (match$7) {
                         if (match$7.tl) {
                           throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "Invalid input line",
-                                Error: new Error()
-                              };
-                        }
-                        return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$6.hd, match$7.hd, "MINUS"),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
-                      }
-                      throw {
                             RE_EXN_ID: "Failure",
                             _1: "Invalid input line",
                             Error: new Error()
                           };
+                        }
+                        return [
+                          {
+                            hd: make_binary_op(ticker_name, match$6.hd, match$7.hd, "MINUS"),
+                            tl: all_tickers
+                          },
+                          ticker_map
+                        ];
+                      }
+                      throw {
+                        RE_EXN_ID: "Failure",
+                        _1: "Invalid input line",
+                        Error: new Error()
+                      };
                     }
                     throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Invalid input line",
-                          Error: new Error()
-                        };
+                      RE_EXN_ID: "Failure",
+                      _1: "Invalid input line",
+                      Error: new Error()
+                    };
                 case "S" :
                     if (match$3.tl) {
                       throw {
-                            RE_EXN_ID: "Failure",
-                            _1: "Invalid input line",
-                            Error: new Error()
-                          };
-                    }
-                    return [
-                            {
-                              hd: {
-                                value: undefined,
-                                rank: "Uninitialized",
-                                ticker_name: ticker_name,
-                                type_: "Market"
-                              },
-                              tl: all_tickers
-                            },
-                            ticker_map
-                          ];
-                default:
-                  throw {
                         RE_EXN_ID: "Failure",
                         _1: "Invalid input line",
                         Error: new Error()
                       };
-              }
-            } else {
-              throw {
+                    }
+                    return [
+                      {
+                        hd: {
+                          value: undefined,
+                          rank: "Uninitialized",
+                          ticker_name: ticker_name,
+                          type_: "Market"
+                        },
+                        tl: all_tickers
+                      },
+                      ticker_map
+                    ];
+                default:
+                  throw {
                     RE_EXN_ID: "Failure",
                     _1: "Invalid input line",
                     Error: new Error()
                   };
+              }
+            } else {
+              throw {
+                RE_EXN_ID: "Failure",
+                _1: "Invalid input line",
+                Error: new Error()
+              };
             }
           } else {
             throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Invalid input line",
-                  Error: new Error()
-                };
-          }
-      default:
-        throw {
               RE_EXN_ID: "Failure",
               _1: "Invalid input line",
               Error: new Error()
             };
-    }
-  } else {
-    throw {
+          }
+      default:
+        throw {
           RE_EXN_ID: "Failure",
           _1: "Invalid input line",
           Error: new Error()
         };
+    }
+  } else {
+    throw {
+      RE_EXN_ID: "Failure",
+      _1: "Invalid input line",
+      Error: new Error()
+    };
   }
 }
 
diff --git a/jscomp/test/to_string_test.js b/jscomp/test/to_string_test.js
index 4bdfdba5d3b..463f6067614 100644
--- a/jscomp/test/to_string_test.js
+++ b/jscomp/test/to_string_test.js
@@ -15,10 +15,10 @@ Mt.from_pair_suites("To_string_test", {
         "File \"to_string_test.res\", line 6, characters 8-15",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: Pervasives.string_of_float(Pervasives.infinity),
-                    _1: "inf"
-                  };
+              TAG: "Eq",
+              _0: Pervasives.string_of_float(Pervasives.infinity),
+              _1: "inf"
+            };
           })
       ],
       tl: {
@@ -26,10 +26,10 @@ Mt.from_pair_suites("To_string_test", {
           "File \"to_string_test.res\", line 6, characters 49-56",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: Pervasives.string_of_float(Pervasives.neg_infinity),
-                      _1: "-inf"
-                    };
+                TAG: "Eq",
+                _0: Pervasives.string_of_float(Pervasives.neg_infinity),
+                _1: "-inf"
+              };
             })
         ],
         tl: /* [] */0
diff --git a/jscomp/test/topsort_test.js b/jscomp/test/topsort_test.js
index 79bc92dff0b..7aeedc79054 100644
--- a/jscomp/test/topsort_test.js
+++ b/jscomp/test/topsort_test.js
@@ -63,15 +63,15 @@ var graph = {
 
 function nexts(x, g) {
   return List.fold_left((function (acc, param) {
-                if (param[0] === x) {
-                  return {
-                          hd: param[1],
-                          tl: acc
-                        };
-                } else {
-                  return acc;
-                }
-              }), /* [] */0, g);
+          if (param[0] === x) {
+            return {
+              hd: param[1],
+              tl: acc
+            };
+          } else {
+            return acc;
+          }
+        }), /* [] */0, g);
 }
 
 function dfs1(_nodes, graph, _visited) {
@@ -123,14 +123,14 @@ if (!Caml_obj.equal(dfs1({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          35,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      35,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 console.log("");
@@ -161,14 +161,14 @@ if (!Caml_obj.equal(dfs1({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      38,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function dfs2(nodes, graph, visited) {
@@ -222,14 +222,14 @@ if (!Caml_obj.equal(dfs2({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      57,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(dfs2({
@@ -258,14 +258,14 @@ if (!Caml_obj.equal(dfs2({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      58,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 function dfs3(nodes, graph) {
@@ -279,8 +279,8 @@ function dfs3(nodes, graph) {
         tl: visited.contents
       };
       return List.iter((function (x) {
-                    aux(x, graph);
-                  }), nexts(node, graph));
+              aux(x, graph);
+            }), nexts(node, graph));
     }
     
   };
@@ -316,14 +316,14 @@ if (!Caml_obj.equal(dfs3({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          74,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      74,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 if (!Caml_obj.equal(dfs3({
@@ -352,14 +352,14 @@ if (!Caml_obj.equal(dfs3({
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      75,
+      2
+    ],
+    Error: new Error()
+  };
 }
 
 var grwork = {
@@ -441,14 +441,14 @@ if (!Caml_obj.equal(unsafe_topsort(grwork), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          112,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      112,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function height(param) {
@@ -465,12 +465,12 @@ function create(l, v, r) {
   var hr;
   hr = typeof r !== "object" ? 0 : r.h;
   return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
+    TAG: "Node",
+    l: l,
+    v: v,
+    r: r,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+  };
 }
 
 function bal(l, v, r) {
@@ -481,10 +481,10 @@ function bal(l, v, r) {
   if (hl > (hr + 2 | 0)) {
     if (typeof l !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var lr = l.r;
     var lv = l.v;
@@ -496,26 +496,26 @@ function bal(l, v, r) {
       return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   }
   if (typeof r !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   }
   var rr = r.r;
   var rv = r.v;
@@ -527,21 +527,21 @@ function bal(l, v, r) {
     return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Set.bal",
+    Error: new Error()
+  };
 }
 
 function add(x, param) {
   if (typeof param !== "object") {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   }
   var r = param.r;
   var v = param.v;
@@ -568,12 +568,12 @@ function add(x, param) {
 
 function singleton(x) {
   return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
+    TAG: "Node",
+    l: "Empty",
+    v: x,
+    r: "Empty",
+    h: 1
+  };
 }
 
 function add_min_element(x, param) {
@@ -615,9 +615,9 @@ function min_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -648,9 +648,9 @@ function max_elt(_param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var r = param.r;
     if (typeof r !== "object") {
@@ -679,10 +679,10 @@ function max_elt_opt(_param) {
 function remove_min_elt(param) {
   if (typeof param !== "object") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.remove_min_elt",
+      Error: new Error()
+    };
   }
   var l = param.l;
   if (typeof l !== "object") {
@@ -705,10 +705,10 @@ function concat(t1, t2) {
 function split(x, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            false,
-            "Empty"
-          ];
+      "Empty",
+      false,
+      "Empty"
+    ];
   }
   var r = param.r;
   var v = param.v;
@@ -716,25 +716,25 @@ function split(x, param) {
   var c = Caml.string_compare(x, v);
   if (c === 0) {
     return [
-            l,
-            true,
-            r
-          ];
+      l,
+      true,
+      r
+    ];
   }
   if (c < 0) {
     var match = split(x, l);
     return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
+      match[0],
+      match[1],
+      join(match[2], v, r)
+    ];
   }
   var match$1 = split(x, r);
   return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    join(l, v, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function is_empty(param) {
@@ -1039,9 +1039,9 @@ function filter(p, param) {
 function partition(p, param) {
   if (typeof param !== "object") {
     return [
-            "Empty",
-            "Empty"
-          ];
+      "Empty",
+      "Empty"
+    ];
   }
   var v = param.v;
   var match = partition(p, param.l);
@@ -1053,14 +1053,14 @@ function partition(p, param) {
   var rt = match$1[0];
   if (pv) {
     return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
+      join(lt, v, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
+      concat(lt, rt),
+      join(lf, v, rf)
+    ];
   }
 }
 
@@ -1097,9 +1097,9 @@ function find(x, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     var c = Caml.string_compare(x, v);
@@ -1116,9 +1116,9 @@ function find_first(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -1181,9 +1181,9 @@ function find_last(f, _param) {
     var param = _param;
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var v = param.v;
     if (Curry._1(f, v)) {
@@ -1304,21 +1304,21 @@ function of_list(l) {
         switch (n) {
           case 0 :
               return [
-                      "Empty",
-                      l
-                    ];
+                "Empty",
+                l
+              ];
           case 1 :
               if (l) {
                 return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    l: "Empty",
+                    v: l.hd,
+                    r: "Empty",
+                    h: 1
+                  },
+                  l.tl
+                ];
               }
               break;
           case 2 :
@@ -1326,21 +1326,21 @@ function of_list(l) {
                 var match = l.tl;
                 if (match) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: l.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      v: match.hd,
+                      r: "Empty",
+                      h: 2
+                    },
+                    match.tl
+                  ];
                 }
                 
               }
@@ -1352,27 +1352,27 @@ function of_list(l) {
                   var match$2 = match$1.tl;
                   if (match$2) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match$1.hd,
+                        r: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: match$2.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        h: 2
+                      },
+                      match$2.tl
+                    ];
                   }
                   
                 }
@@ -1388,19 +1388,19 @@ function of_list(l) {
         if (l$1) {
           var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
           return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
+            create(match$3[0], l$1.hd, match$4[0]),
+            match$4[1]
+          ];
         }
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "set.res",
+            691,
+            20
+          ],
+          Error: new Error()
+        };
       };
       return sub(List.length(l$1), l$1)[0];
     } else {
@@ -1464,21 +1464,21 @@ function pathsort(graph) {
     var set = param[0];
     if (mem(node, set)) {
       throw {
-            RE_EXN_ID: Cycle,
-            _1: {
-              hd: node,
-              tl: stack
-            },
-            Error: new Error()
-          };
+        RE_EXN_ID: Cycle,
+        _1: {
+          hd: node,
+          tl: stack
+        },
+        Error: new Error()
+      };
     }
     return [
-            add(node, set),
-            {
-              hd: node,
-              tl: stack
-            }
-          ];
+      add(node, set),
+      {
+        hd: node,
+        tl: stack
+      }
+    ];
   };
   var sort_nodes = function (path, nodes) {
     List.iter((function (node) {
@@ -1522,14 +1522,14 @@ if (!Caml_obj.equal(pathsort(grwork), {
         }
       })) {
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          144,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      144,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 try {
@@ -1541,14 +1541,14 @@ try {
         tl: grwork
       });
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "topsort_test.res",
+      148,
+      2
+    ],
+    Error: new Error()
+  };
 }
 catch (raw_exn){
   var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1579,14 +1579,14 @@ catch (raw_exn){
   }
   if (exit === 1) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "topsort_test.res",
-            151,
-            7
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "topsort_test.res",
+        151,
+        7
+      ],
+      Error: new Error()
+    };
   }
   
 }
diff --git a/jscomp/test/tramp_fib.js b/jscomp/test/tramp_fib.js
index 11f7db3f2e1..10ea99b2a97 100644
--- a/jscomp/test/tramp_fib.js
+++ b/jscomp/test/tramp_fib.js
@@ -20,23 +20,23 @@ function fib(n, k) {
     return k(1);
   } else {
     return {
-            TAG: "Suspend",
-            _0: (function () {
-                return fib(n - 1 | 0, (function (v0) {
-                              return fib(n - 2 | 0, (function (v1) {
-                                            return k(v0 + v1 | 0);
-                                          }));
-                            }));
-              })
-          };
+      TAG: "Suspend",
+      _0: (function () {
+          return fib(n - 1 | 0, (function (v0) {
+                  return fib(n - 2 | 0, (function (v1) {
+                          return k(v0 + v1 | 0);
+                        }));
+                }));
+        })
+    };
   }
 }
 
 var u = fib(10, (function (x) {
         return {
-                TAG: "Continue",
-                _0: x
-              };
+          TAG: "Continue",
+          _0: x
+        };
       }));
 
 function iter(_bounce) {
@@ -54,22 +54,22 @@ function isEven(n) {
   if (n !== 0) {
     if (n !== 1) {
       return {
-              TAG: "Suspend",
-              _0: (function () {
-                  return isOdd(n - 1 | 0);
-                })
-            };
+        TAG: "Suspend",
+        _0: (function () {
+            return isOdd(n - 1 | 0);
+          })
+      };
     } else {
       return {
-              TAG: "Continue",
-              _0: false
-            };
+        TAG: "Continue",
+        _0: false
+      };
     }
   } else {
     return {
-            TAG: "Continue",
-            _0: true
-          };
+      TAG: "Continue",
+      _0: true
+    };
   }
 }
 
@@ -79,15 +79,15 @@ function isOdd(n) {
       return isEven(n - 1 | 0);
     } else {
       return {
-              TAG: "Continue",
-              _0: true
-            };
+        TAG: "Continue",
+        _0: true
+      };
     }
   } else {
     return {
-            TAG: "Continue",
-            _0: false
-          };
+      TAG: "Continue",
+      _0: false
+    };
   }
 }
 
diff --git a/jscomp/test/tuple_alloc.js b/jscomp/test/tuple_alloc.js
index da5ac777a88..e9acf698520 100644
--- a/jscomp/test/tuple_alloc.js
+++ b/jscomp/test/tuple_alloc.js
@@ -41,8 +41,8 @@ function kf(cb, v) {
 
 function ikf(v) {
   return kf((function (prim) {
-                
-              }), v);
+          
+        }), v);
 }
 
 exports.v = v;
diff --git a/jscomp/test/typeof_test.js b/jscomp/test/typeof_test.js
index 0985549075f..cb0d6dca083 100644
--- a/jscomp/test/typeof_test.js
+++ b/jscomp/test/typeof_test.js
@@ -32,10 +32,10 @@ var suites_0 = [
   "int_type",
   (function (param) {
       return {
-              TAG: "Eq",
-              _0: "number",
-              _1: "number"
-            };
+        TAG: "Eq",
+        _0: "number",
+        _1: "number"
+      };
     })
 ];
 
@@ -44,10 +44,10 @@ var suites_1 = {
     "string_type",
     (function (param) {
         return {
-                TAG: "Eq",
-                _0: "string",
-                _1: "string"
-              };
+          TAG: "Eq",
+          _0: "string",
+          _1: "string"
+        };
       })
   ],
   tl: {
@@ -55,10 +55,10 @@ var suites_1 = {
       "number_gadt_test",
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: Js_types.test(3, "Number"),
-                  _1: true
-                };
+            TAG: "Eq",
+            _0: Js_types.test(3, "Number"),
+            _1: true
+          };
         })
     ],
     tl: {
@@ -66,10 +66,10 @@ var suites_1 = {
         "boolean_gadt_test",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: Js_types.test(true, "Boolean"),
-                    _1: true
-                  };
+              TAG: "Eq",
+              _0: Js_types.test(true, "Boolean"),
+              _1: true
+            };
           })
       ],
       tl: {
@@ -77,10 +77,10 @@ var suites_1 = {
           "undefined_gadt_test",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: Js_types.test(undefined, "Undefined"),
-                      _1: true
-                    };
+                TAG: "Eq",
+                _0: Js_types.test(undefined, "Undefined"),
+                _1: true
+              };
             })
         ],
         tl: {
@@ -88,10 +88,10 @@ var suites_1 = {
             "string_on_number1",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: string_or_number("xx"),
-                        _1: true
-                      };
+                  TAG: "Eq",
+                  _0: string_or_number("xx"),
+                  _1: true
+                };
               })
           ],
           tl: {
@@ -99,10 +99,10 @@ var suites_1 = {
               "string_on_number2",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: string_or_number(3.02),
-                          _1: true
-                        };
+                    TAG: "Eq",
+                    _0: string_or_number(3.02),
+                    _1: true
+                  };
                 })
             ],
             tl: {
@@ -110,12 +110,12 @@ var suites_1 = {
                 "string_on_number3",
                 (function (param) {
                     return {
-                            TAG: "Eq",
-                            _0: string_or_number(function (x) {
-                                  return x;
-                                }),
-                            _1: false
-                          };
+                      TAG: "Eq",
+                      _0: string_or_number(function (x) {
+                            return x;
+                          }),
+                      _1: false
+                    };
                   })
               ],
               tl: {
@@ -123,10 +123,10 @@ var suites_1 = {
                   "string_gadt_test",
                   (function (param) {
                       return {
-                              TAG: "Eq",
-                              _0: Js_types.test("3", "String"),
-                              _1: true
-                            };
+                        TAG: "Eq",
+                        _0: Js_types.test("3", "String"),
+                        _1: true
+                      };
                     })
                 ],
                 tl: {
@@ -134,10 +134,10 @@ var suites_1 = {
                     "string_gadt_test_neg",
                     (function (param) {
                         return {
-                                TAG: "Eq",
-                                _0: Js_types.test(3, "String"),
-                                _1: false
-                              };
+                          TAG: "Eq",
+                          _0: Js_types.test(3, "String"),
+                          _1: false
+                        };
                       })
                   ],
                   tl: {
@@ -145,12 +145,12 @@ var suites_1 = {
                       "function_gadt_test",
                       (function (param) {
                           return {
-                                  TAG: "Eq",
-                                  _0: Js_types.test((function (x) {
-                                          return x;
-                                        }), "Function"),
-                                  _1: true
-                                };
+                            TAG: "Eq",
+                            _0: Js_types.test((function (x) {
+                                    return x;
+                                  }), "Function"),
+                            _1: true
+                          };
                         })
                     ],
                     tl: {
@@ -158,12 +158,12 @@ var suites_1 = {
                         "object_gadt_test",
                         (function (param) {
                             return {
-                                    TAG: "Eq",
-                                    _0: Js_types.test({
-                                          x: 3
-                                        }, "Object"),
-                                    _1: true
-                                  };
+                              TAG: "Eq",
+                              _0: Js_types.test({
+                                    x: 3
+                                  }, "Object"),
+                              _1: true
+                            };
                           })
                       ],
                       tl: /* [] */0
diff --git a/jscomp/test/unboxed_attribute.js b/jscomp/test/unboxed_attribute.js
index 6f17c3a17e6..ca01d88ecff 100644
--- a/jscomp/test/unboxed_attribute.js
+++ b/jscomp/test/unboxed_attribute.js
@@ -4,9 +4,9 @@
 
 function u(param) {
   return [
-          3,
-          u
-        ];
+    3,
+    u
+  ];
 }
 
 exports.u = u;
diff --git a/jscomp/test/unboxed_use_case.js b/jscomp/test/unboxed_use_case.js
index 1be44ce0dab..cb5e7e206fb 100644
--- a/jscomp/test/unboxed_use_case.js
+++ b/jscomp/test/unboxed_use_case.js
@@ -6,9 +6,9 @@ var Caml_obj = require("../../lib/js/caml_obj.js");
 
 function map_pair(r, param) {
   return [
-          Curry._1(r, param[0]),
-          Curry._1(r, param[1])
-        ];
+    Curry._1(r, param[0]),
+    Curry._1(r, param[1])
+  ];
 }
 
 function u(x) {
diff --git a/jscomp/test/uncurried_cast.js b/jscomp/test/uncurried_cast.js
index 0e633f6d807..19b4e4cb3b1 100644
--- a/jscomp/test/uncurried_cast.js
+++ b/jscomp/test/uncurried_cast.js
@@ -24,9 +24,9 @@ var E = /* @__PURE__ */Caml_exceptions.create("Uncurried_cast.E");
 
 function testRaise(param) {
   throw {
-        RE_EXN_ID: E,
-        Error: new Error()
-      };
+    RE_EXN_ID: E,
+    Error: new Error()
+  };
 }
 
 var l = Belt_List.mapU({
@@ -79,9 +79,9 @@ var StandardNotation = {
 
 function testRaise$1() {
   throw {
-        RE_EXN_ID: E,
-        Error: new Error()
-      };
+    RE_EXN_ID: E,
+    Error: new Error()
+  };
 }
 
 var l$1 = Belt_List.mapU({
diff --git a/jscomp/test/uncurry_external_test.js b/jscomp/test/uncurry_external_test.js
index 7c8ecf39ebf..8d713d1ca63 100644
--- a/jscomp/test/uncurry_external_test.js
+++ b/jscomp/test/uncurry_external_test.js
@@ -18,10 +18,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/uncurry_glob_test.js b/jscomp/test/uncurry_glob_test.js
index 0c9c40a8250..c0703e56280 100644
--- a/jscomp/test/uncurry_glob_test.js
+++ b/jscomp/test/uncurry_glob_test.js
@@ -5,8 +5,8 @@
 function M(U) {
   var v = U.f(100, "x");
   return {
-          v: v
-        };
+    v: v
+  };
 }
 
 function f() {
diff --git a/jscomp/test/uncurry_test.js b/jscomp/test/uncurry_test.js
index cbce7ce877a..3b5f0ee8460 100644
--- a/jscomp/test/uncurry_test.js
+++ b/jscomp/test/uncurry_test.js
@@ -12,9 +12,9 @@ function f1(a0) {
 
 function f2(a0, a1) {
   return [
-          a0,
-          a1
-        ];
+    a0,
+    a1
+  ];
 }
 
 console.log(0);
diff --git a/jscomp/test/undef_regression2_test.js b/jscomp/test/undef_regression2_test.js
index f9c83da6645..3774e92372d 100644
--- a/jscomp/test/undef_regression2_test.js
+++ b/jscomp/test/undef_regression2_test.js
@@ -19,10 +19,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -36,9 +36,9 @@ function ok(loc, x) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Ok",
-                  _0: x
-                };
+            TAG: "Ok",
+            _0: x
+          };
         })
     ],
     tl: suites.contents
diff --git a/jscomp/test/unit_undefined_test.js b/jscomp/test/unit_undefined_test.js
index 7c555d8c6ec..87d261715c3 100644
--- a/jscomp/test/unit_undefined_test.js
+++ b/jscomp/test/unit_undefined_test.js
@@ -18,12 +18,12 @@ function eq(loc, x, y) {
 
 function f_01(param) {
   return hi(function (x) {
-              if (x === undefined) {
-                console.log("x");
-                return;
-              }
-              
-            });
+        if (x === undefined) {
+          console.log("x");
+          return;
+        }
+        
+      });
 }
 
 function u(x) {
diff --git a/jscomp/test/unsafe_ppx_test.js b/jscomp/test/unsafe_ppx_test.js
index e3ec3bd1c02..9ead28c96c6 100644
--- a/jscomp/test/unsafe_ppx_test.js
+++ b/jscomp/test/unsafe_ppx_test.js
@@ -57,10 +57,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
         "unsafe_max",
         (function (param) {
             return {
-                    TAG: "Eq",
-                    _0: 2,
-                    _1: max(1, 2)
-                  };
+              TAG: "Eq",
+              _0: 2,
+              _1: max(1, 2)
+            };
           })
       ],
       tl: {
@@ -68,10 +68,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
           "unsafe_test",
           (function (param) {
               return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: v
-                    };
+                TAG: "Eq",
+                _0: 3,
+                _1: v
+              };
             })
         ],
         tl: {
@@ -79,10 +79,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
             "unsafe_max2",
             (function (param) {
                 return {
-                        TAG: "Eq",
-                        _0: 2,
-                        _1: Math.max(1, 2)
-                      };
+                  TAG: "Eq",
+                  _0: 2,
+                  _1: Math.max(1, 2)
+                };
               })
           ],
           tl: {
@@ -90,10 +90,10 @@ Mt.from_pair_suites("Unsafe_ppx_test", {
               "ffi_keys",
               (function (param) {
                   return {
-                          TAG: "Eq",
-                          _0: ["a"],
-                          _1: Ffi_js_test.keys({a : 3})
-                        };
+                    TAG: "Eq",
+                    _0: ["a"],
+                    _1: Ffi_js_test.keys({a : 3})
+                  };
                 })
             ],
             tl: /* [] */0
diff --git a/jscomp/test/update_record_test.js b/jscomp/test/update_record_test.js
index d02cbf88541..5084a97e4a2 100644
--- a/jscomp/test/update_record_test.js
+++ b/jscomp/test/update_record_test.js
@@ -23,10 +23,10 @@ function eq(loc, x, y) {
       loc + (" id " + String(test_id.contents)),
       (function (param) {
           return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
+            TAG: "Eq",
+            _0: x,
+            _1: y
+          };
         })
     ],
     tl: suites.contents
@@ -36,13 +36,13 @@ function eq(loc, x, y) {
 function f(x) {
   var y = Caml_obj.obj_dup(x);
   return {
-          a0: 1,
-          a1: y.a1,
-          a2: y.a2,
-          a3: y.a3,
-          a4: y.a4,
-          a5: y.a5
-        };
+    a0: 1,
+    a1: y.a1,
+    a2: y.a2,
+    a3: y.a3,
+    a4: y.a4,
+    a5: y.a5
+  };
 }
 
 eq("File \"update_record_test.res\", line 28, characters 5-12", 1, f({
@@ -61,9 +61,9 @@ var val0 = {
 
 function fff(x) {
   return {
-          "invalid_js_id'": x["invalid_js_id'"] + 2 | 0,
-          x: x.x
-        };
+    "invalid_js_id'": x["invalid_js_id'"] + 2 | 0,
+    x: x.x
+  };
 }
 
 var val1 = fff(val0);
diff --git a/jscomp/test/variant.js b/jscomp/test/variant.js
index dfdf63037af..f2314392aa5 100644
--- a/jscomp/test/variant.js
+++ b/jscomp/test/variant.js
@@ -69,8 +69,8 @@ function Make(M) {
     
   };
   return {
-          find: find
-        };
+    find: find
+  };
 }
 
 function find(x) {
diff --git a/jscomp/test/variantsMatching.js b/jscomp/test/variantsMatching.js
index 30080878ca9..7656ef95bcc 100644
--- a/jscomp/test/variantsMatching.js
+++ b/jscomp/test/variantsMatching.js
@@ -290,9 +290,9 @@ function plus$3(x, y) {
     }
   } else if (!(y === undefined || y === null || y === "WhyNotAnotherOne")) {
     return {
-            x: x.x + y.x,
-            y: x.y + y.y
-          };
+      x: x.x + y.x,
+      y: x.y + y.y
+    };
   }
   if (!(y === undefined || y === null || y === "WhyNotAnotherOne")) {
     return "WhyNotAnotherOne";
diff --git a/jscomp/test/webpack_config.js b/jscomp/test/webpack_config.js
index eea17ea71c7..99a454d6ae8 100644
--- a/jscomp/test/webpack_config.js
+++ b/jscomp/test/webpack_config.js
@@ -39,19 +39,19 @@ var B = {};
 
 function f(param) {
   return [
-          (function (prim) {
-              List$3.ff();
-            }),
-          (function (prim) {
-              List$3.ff2();
-            }),
-          (function (prim) {
-              List$2.ff();
-            }),
-          (function (prim) {
-              List$2.ff2();
-            })
-        ];
+    (function (prim) {
+        List$3.ff();
+      }),
+    (function (prim) {
+        List$3.ff2();
+      }),
+    (function (prim) {
+        List$2.ff();
+      }),
+    (function (prim) {
+        List$2.ff2();
+      })
+  ];
 }
 
 List$1.xx();
diff --git a/lib/es6/arg.js b/lib/es6/arg.js
index a4e741dcdca..5fd6aad7afb 100644
--- a/lib/es6/arg.js
+++ b/lib/es6/arg.js
@@ -33,9 +33,9 @@ function assoc3(x, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -43,16 +43,16 @@ function split(s) {
   var i = $$String.index(s, /* '=' */61);
   var len = s.length;
   return [
-          $$String.sub(s, 0, i),
-          $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0)
-        ];
+    $$String.sub(s, 0, i),
+    $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0)
+  ];
 }
 
 function make_symlist(prefix, sep, suffix, l) {
   if (l) {
     return List.fold_left((function (x, y) {
-                  return x + (sep + y);
-                }), prefix + l.hd, l.tl) + suffix;
+            return x + (sep + y);
+          }), prefix + l.hd, l.tl) + suffix;
   } else {
     return "<none>";
   }
@@ -60,13 +60,13 @@ function make_symlist(prefix, sep, suffix, l) {
 
 function help_action(param) {
   throw {
-        RE_EXN_ID: Stop,
-        _1: {
-          TAG: "Unknown",
-          _0: "-help"
-        },
-        Error: new Error()
-      };
+    RE_EXN_ID: Stop,
+    _1: {
+      TAG: "Unknown",
+      _0: "-help"
+    },
+    Error: new Error()
+  };
 }
 
 function add_help(speclist) {
@@ -225,14 +225,14 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             _0: "--help"
           })) {
       return {
-              RE_EXN_ID: Help,
-              _1: $$Buffer.contents(b)
-            };
+        RE_EXN_ID: Help,
+        _1: $$Buffer.contents(b)
+      };
     } else {
       return {
-              RE_EXN_ID: Bad,
-              _1: $$Buffer.contents(b)
-            };
+        RE_EXN_ID: Bad,
+        _1: $$Buffer.contents(b)
+      };
     }
   };
   current.contents = current.contents + 1 | 0;
@@ -261,13 +261,13 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
               var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
               if (exn$1.RE_EXN_ID === "Not_found") {
                 throw {
-                      RE_EXN_ID: Stop,
-                      _1: {
-                        TAG: "Unknown",
-                        _0: s
-                      },
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stop,
+                  _1: {
+                    TAG: "Unknown",
+                    _0: s
+                  },
+                  Error: new Error()
+                };
               }
               throw exn$1;
             }
@@ -282,15 +282,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             return;
           }
           throw {
-                RE_EXN_ID: Stop,
-                _1: {
-                  TAG: "Wrong",
-                  _0: s,
-                  _1: follow,
-                  _2: "no argument"
-                },
-                Error: new Error()
-              };
+            RE_EXN_ID: Stop,
+            _1: {
+              TAG: "Wrong",
+              _0: s,
+              _1: follow,
+              _2: "no argument"
+            },
+            Error: new Error()
+          };
         }
         }(s,follow));
         var get_arg = (function(s,follow){
@@ -302,13 +302,13 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             return Caml_array.get(argv.contents, current.contents + 1 | 0);
           }
           throw {
-                RE_EXN_ID: Stop,
-                _1: {
-                  TAG: "Missing",
-                  _0: s
-                },
-                Error: new Error()
-              };
+            RE_EXN_ID: Stop,
+            _1: {
+              TAG: "Missing",
+              _0: s
+            },
+            Error: new Error()
+          };
         }
         }(s,follow));
         var consume_arg = (function(follow){
@@ -333,15 +333,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, s$1);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg,
-                          _2: "a boolean"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg,
+                      _2: "a boolean"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set" :
@@ -366,15 +366,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, x);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$2,
-                          _2: "an integer"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$2,
+                      _2: "an integer"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set_int" :
@@ -384,15 +384,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   f._0.contents = x$1;
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$3,
-                          _2: "an integer"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$3,
+                      _2: "an integer"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Float" :
@@ -402,15 +402,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, x$2);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$4,
-                          _2: "a float"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$4,
+                      _2: "a float"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set_float" :
@@ -420,15 +420,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   f._0.contents = x$3;
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$5,
-                          _2: "a float"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$5,
+                      _2: "a float"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Tuple" :
@@ -441,15 +441,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   return consume_arg();
                 }
                 throw {
-                      RE_EXN_ID: Stop,
-                      _1: {
-                        TAG: "Wrong",
-                        _0: s,
-                        _1: arg$6,
-                        _2: "one of: " + make_symlist("", " ", "", symb)
-                      },
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stop,
+                  _1: {
+                    TAG: "Wrong",
+                    _0: s,
+                    _1: arg$6,
+                    _2: "one of: " + make_symlist("", " ", "", symb)
+                  },
+                  Error: new Error()
+                };
             case "Rest" :
                 var f$1 = f._0;
                 while(current.contents < (argv.contents.length - 1 | 0)) {
@@ -460,10 +460,10 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             case "Expand" :
                 if (!allow_expand) {
                   throw {
-                        RE_EXN_ID: "Invalid_argument",
-                        _1: "Arg.Expand is is only allowed with Arg.parse_and_expand_argv_dynamic",
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: "Invalid_argument",
+                    _1: "Arg.Expand is is only allowed with Arg.parse_and_expand_argv_dynamic",
+                    Error: new Error()
+                  };
                 }
                 var arg$7 = get_arg();
                 var newarg = Curry._1(f._0, arg$7);
@@ -494,9 +494,9 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
       var m = Caml_js_exceptions.internalToOCamlException(raw_m);
       if (m.RE_EXN_ID === Bad) {
         throw convert_error({
-                  TAG: "Message",
-                  _0: m._1
-                });
+              TAG: "Message",
+              _0: m._1
+            });
       }
       if (m.RE_EXN_ID === Stop) {
         throw convert_error(m._1);
@@ -648,13 +648,13 @@ function replace_leading_tab(s) {
     contents: false
   };
   return $$String.map((function (c) {
-                if (c !== 9 || seen.contents) {
-                  return c;
-                } else {
-                  seen.contents = true;
-                  return /* ' ' */32;
-                }
-              }), s);
+          if (c !== 9 || seen.contents) {
+            return c;
+          } else {
+            seen.contents = true;
+            return /* ' ' */32;
+          }
+        }), s);
 }
 
 function align(limitOpt, speclist) {
@@ -663,41 +663,41 @@ function align(limitOpt, speclist) {
   var len = List.fold_left(max_arg_len, 0, completed);
   var len$1 = len < limit ? len : limit;
   return List.map((function (param) {
-                var spec = param[1];
-                var kwd = param[0];
-                if (param[2] === "") {
-                  return param;
-                }
-                if (spec.TAG === "Symbol") {
-                  var msg = param[2];
-                  var cutcol = second_word(msg);
-                  var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0);
-                  return [
-                          kwd,
-                          spec,
-                          "\n" + (spaces + replace_leading_tab(msg))
-                        ];
-                }
-                var msg$1 = param[2];
-                var cutcol$1 = second_word(msg$1);
-                var kwd_len = kwd.length;
-                var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0;
-                if (diff <= 0) {
-                  return [
-                          kwd,
-                          spec,
-                          replace_leading_tab(msg$1)
-                        ];
-                }
-                var spaces$1 = " ".repeat(diff);
-                var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1);
-                var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0);
-                return [
-                        kwd,
-                        spec,
-                        prefix + (spaces$1 + suffix)
-                      ];
-              }), completed);
+          var spec = param[1];
+          var kwd = param[0];
+          if (param[2] === "") {
+            return param;
+          }
+          if (spec.TAG === "Symbol") {
+            var msg = param[2];
+            var cutcol = second_word(msg);
+            var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0);
+            return [
+              kwd,
+              spec,
+              "\n" + (spaces + replace_leading_tab(msg))
+            ];
+          }
+          var msg$1 = param[2];
+          var cutcol$1 = second_word(msg$1);
+          var kwd_len = kwd.length;
+          var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0;
+          if (diff <= 0) {
+            return [
+              kwd,
+              spec,
+              replace_leading_tab(msg$1)
+            ];
+          }
+          var spaces$1 = " ".repeat(diff);
+          var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1);
+          var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0);
+          return [
+            kwd,
+            spec,
+            prefix + (spaces$1 + suffix)
+          ];
+        }), completed);
 }
 
 export {
diff --git a/lib/es6/array.js b/lib/es6/array.js
index 34f0073e58d..398becc505d 100644
--- a/lib/es6/array.js
+++ b/lib/es6/array.js
@@ -16,10 +16,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, Curry._1(f, 0));
   for(var i = 1; i < l; ++i){
@@ -59,10 +59,10 @@ function append(a1, a2) {
 function sub(a, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.sub",
+      Error: new Error()
+    };
   }
   return Caml_array.sub(a, ofs, len);
 }
@@ -70,10 +70,10 @@ function sub(a, ofs, len) {
 function fill(a, ofs, len, v) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.fill",
+      Error: new Error()
+    };
   }
   for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){
     a[i] = v;
@@ -83,10 +83,10 @@ function fill(a, ofs, len, v) {
 function blit(a1, ofs1, a2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (a1.length - len | 0) || ofs2 < 0 || ofs2 > (a2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.blit",
+      Error: new Error()
+    };
   }
   Caml_array.blit(a1, ofs1, a2, ofs2, len);
 }
@@ -100,10 +100,10 @@ function iter(f, a) {
 function iter2(f, a, b) {
   if (a.length !== b.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.iter2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.iter2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
     Curry._2(f, a[i], b[i]);
@@ -127,10 +127,10 @@ function map2(f, a, b) {
   var lb = b.length;
   if (la !== lb) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.map2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.map2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   if (la === 0) {
     return [];
@@ -313,10 +313,10 @@ function sort(cmp, a) {
       return i31;
     }
     throw {
-          RE_EXN_ID: Bottom,
-          _1: i,
-          Error: new Error()
-        };
+      RE_EXN_ID: Bottom,
+      _1: i,
+      Error: new Error()
+    };
   };
   var trickle = function (l, i, e) {
     try {
@@ -365,14 +365,14 @@ function sort(cmp, a) {
       var father = (i - 1 | 0) / 3 | 0;
       if (i === father) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "array.res",
-                321,
-                4
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "array.res",
+            321,
+            4
+          ],
+          Error: new Error()
+        };
       }
       if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) {
         return Caml_array.set(a, i, e);
diff --git a/lib/es6/arrayLabels.js b/lib/es6/arrayLabels.js
index f861857f528..f569f6cd892 100644
--- a/lib/es6/arrayLabels.js
+++ b/lib/es6/arrayLabels.js
@@ -16,10 +16,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, Curry._1(f, 0));
   for(var i = 1; i < l; ++i){
@@ -59,10 +59,10 @@ function append(a1, a2) {
 function sub(a, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.sub",
+      Error: new Error()
+    };
   }
   return Caml_array.sub(a, ofs, len);
 }
@@ -70,10 +70,10 @@ function sub(a, ofs, len) {
 function fill(a, ofs, len, v) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.fill",
+      Error: new Error()
+    };
   }
   for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){
     a[i] = v;
@@ -83,10 +83,10 @@ function fill(a, ofs, len, v) {
 function blit(a1, ofs1, a2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (a1.length - len | 0) || ofs2 < 0 || ofs2 > (a2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.blit",
+      Error: new Error()
+    };
   }
   Caml_array.blit(a1, ofs1, a2, ofs2, len);
 }
@@ -100,10 +100,10 @@ function iter(f, a) {
 function iter2(f, a, b) {
   if (a.length !== b.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.iter2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.iter2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
     Curry._2(f, a[i], b[i]);
@@ -127,10 +127,10 @@ function map2(f, a, b) {
   var lb = b.length;
   if (la !== lb) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.map2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.map2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   if (la === 0) {
     return [];
@@ -313,10 +313,10 @@ function sort(cmp, a) {
       return i31;
     }
     throw {
-          RE_EXN_ID: Bottom,
-          _1: i,
-          Error: new Error()
-        };
+      RE_EXN_ID: Bottom,
+      _1: i,
+      Error: new Error()
+    };
   };
   var trickle = function (l, i, e) {
     try {
@@ -365,14 +365,14 @@ function sort(cmp, a) {
       var father = (i - 1 | 0) / 3 | 0;
       if (i === father) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "arrayLabels.res",
-                321,
-                4
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "arrayLabels.res",
+            321,
+            4
+          ],
+          Error: new Error()
+        };
       }
       if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) {
         return Caml_array.set(a, i, e);
diff --git a/lib/es6/belt_Array.js b/lib/es6/belt_Array.js
index ea3d9cc0cd8..22213e28c08 100644
--- a/lib/es6/belt_Array.js
+++ b/lib/es6/belt_Array.js
@@ -15,14 +15,14 @@ function get(arr, i) {
 function getExn(arr, i) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "belt_Array.res",
-            36,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "belt_Array.res",
+        36,
+        2
+      ],
+      Error: new Error()
+    };
   }
   return arr[i];
 }
@@ -39,14 +39,14 @@ function set(arr, i, v) {
 function setExn(arr, i, v) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "belt_Array.res",
-            49,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "belt_Array.res",
+        49,
+        2
+      ],
+      Error: new Error()
+    };
   }
   arr[i] = v;
 }
@@ -627,9 +627,9 @@ function partitionU(a, f) {
   a1.length = i;
   a2.length = j;
   return [
-          a1,
-          a2
-        ];
+    a1,
+    a2
+  ];
 }
 
 function partition(a, f) {
@@ -646,9 +646,9 @@ function unzip(a) {
     a2[i] = match[1];
   }
   return [
-          a1,
-          a2
-        ];
+    a1,
+    a2
+  ];
 }
 
 function joinWithU(a, sep, toString) {
diff --git a/lib/es6/belt_Id.js b/lib/es6/belt_Id.js
index 502ba7ed5ee..c8ceb8e9eca 100644
--- a/lib/es6/belt_Id.js
+++ b/lib/es6/belt_Id.js
@@ -10,21 +10,21 @@ function MakeComparable(M) {
   var cmp = M.cmp;
   var cmp$1 = Curry.__2(cmp);
   return {
-          cmp: cmp$1
-        };
+    cmp: cmp$1
+  };
 }
 
 function comparableU(cmp) {
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function comparable(cmp) {
   var cmp$1 = Curry.__2(cmp);
   return {
-          cmp: cmp$1
-        };
+    cmp: cmp$1
+  };
 }
 
 function MakeHashableU(M) {
@@ -37,25 +37,25 @@ function MakeHashable(M) {
   var eq = M.eq;
   var eq$1 = Curry.__2(eq);
   return {
-          hash: hash$1,
-          eq: eq$1
-        };
+    hash: hash$1,
+    eq: eq$1
+  };
 }
 
 function hashableU(hash, eq) {
   return {
-          hash: hash,
-          eq: eq
-        };
+    hash: hash,
+    eq: eq
+  };
 }
 
 function hashable(hash, eq) {
   var hash$1 = Curry.__1(hash);
   var eq$1 = Curry.__2(eq);
   return {
-          hash: hash$1,
-          eq: eq$1
-        };
+    hash: hash$1,
+    eq: eq$1
+  };
 }
 
 export {
diff --git a/lib/es6/belt_List.js b/lib/es6/belt_List.js
index 563234042e3..1d1fb5eb8f1 100644
--- a/lib/es6/belt_List.js
+++ b/lib/es6/belt_List.js
@@ -17,9 +17,9 @@ function headExn(x) {
     return x.hd;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function tail(x) {
@@ -34,16 +34,16 @@ function tailExn(x) {
     return x.tl;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function add(xs, x) {
   return {
-          hd: x,
-          tl: xs
-        };
+    hd: x,
+    tl: xs
+  };
 }
 
 function get(x, n) {
@@ -71,9 +71,9 @@ function get(x, n) {
 function getExn(x, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var _x = x;
   var _n = n;
@@ -89,9 +89,9 @@ function getExn(x, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -477,9 +477,9 @@ function splitAt(lst, n) {
   }
   if (n === 0) {
     return [
-            /* [] */0,
-            lst
-          ];
+      /* [] */0,
+      lst
+    ];
   }
   if (!lst) {
     return;
@@ -491,9 +491,9 @@ function splitAt(lst, n) {
   var rest = splitAtAux(n - 1 | 0, lst.tl, cell);
   if (rest !== undefined) {
     return [
-            cell,
-            rest
-          ];
+      cell,
+      rest
+    ];
   }
   
 }
@@ -1189,23 +1189,23 @@ function removeAssoc(xs, x, eq) {
 function setAssocU(xs, x, k, eq) {
   if (!xs) {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: /* [] */0
+    };
   }
   var l = xs.tl;
   var pair = xs.hd;
   if (eq(pair[0], x)) {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: l
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: l
+    };
   }
   var cell = {
     hd: pair,
@@ -1216,12 +1216,12 @@ function setAssocU(xs, x, k, eq) {
     return cell;
   } else {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: xs
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: xs
+    };
   }
 }
 
@@ -1340,9 +1340,9 @@ function keepMap(xs, p) {
 function partitionU(l, p) {
   if (!l) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var h = l.hd;
   var nextX = {
@@ -1357,14 +1357,14 @@ function partitionU(l, p) {
   partitionAux(p, l.tl, nextX, nextY);
   if (b) {
     return [
-            nextX,
-            nextY.tl
-          ];
+      nextX,
+      nextY.tl
+    ];
   } else {
     return [
-            nextX.tl,
-            nextY
-          ];
+      nextX.tl,
+      nextY
+    ];
   }
 }
 
@@ -1375,9 +1375,9 @@ function partition(l, p) {
 function unzip(xs) {
   if (!xs) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = xs.hd;
   var cellX = {
@@ -1390,9 +1390,9 @@ function unzip(xs) {
   };
   splitAux(xs.tl, cellX, cellY);
   return [
-          cellX,
-          cellY
-        ];
+    cellX,
+    cellY
+  ];
 }
 
 function zip(l1, l2) {
diff --git a/lib/es6/belt_Map.js b/lib/es6/belt_Map.js
index 37243510c45..f80ddd764b3 100644
--- a/lib/es6/belt_Map.js
+++ b/lib/es6/belt_Map.js
@@ -6,9 +6,9 @@ import * as Belt_MapDict from "./belt_MapDict.js";
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.fromArray(data, cmp)
+  };
 }
 
 function remove(m, x) {
@@ -19,9 +19,9 @@ function remove(m, x) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
@@ -29,33 +29,33 @@ function removeMany(m, x) {
   var cmp = m.cmp;
   var newData = Belt_MapDict.removeMany(m.data, x, cmp);
   return {
-          cmp: cmp,
-          data: newData
-        };
+    cmp: cmp,
+    data: newData
+  };
 }
 
 function set(m, key, d) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.set(m.data, key, d, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.set(m.data, key, d, cmp)
+  };
 }
 
 function mergeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.mergeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.mergeMany(m.data, e, cmp)
+  };
 }
 
 function updateU(m, key, f) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.updateU(m.data, key, f, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.updateU(m.data, key, f, cmp)
+  };
 }
 
 function update(m, key, f) {
@@ -67,26 +67,26 @@ function split(m, x) {
   var match = Belt_MapDict.split(m.data, x, cmp);
   var match$1 = match[0];
   return [
-          [
-            {
-              cmp: cmp,
-              data: match$1[0]
-            },
-            {
-              cmp: cmp,
-              data: match$1[1]
-            }
-          ],
-          match[1]
-        ];
+    [
+      {
+        cmp: cmp,
+        data: match$1[0]
+      },
+      {
+        cmp: cmp,
+        data: match$1[1]
+      }
+    ],
+    match[1]
+  ];
 }
 
 function mergeU(s1, s2, f) {
   var cmp = s1.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp)
+  };
 }
 
 function merge(s1, s2, f) {
@@ -95,9 +95,9 @@ function merge(s1, s2, f) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(map) {
@@ -146,9 +146,9 @@ function some(m, f) {
 
 function keepU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.keepU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.keepU(m.data, f)
+  };
 }
 
 function keep(m, f) {
@@ -159,15 +159,15 @@ function partitionU(m, p) {
   var cmp = m.cmp;
   var match = Belt_MapDict.partitionU(m.data, p);
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(m, p) {
@@ -176,9 +176,9 @@ function partition(m, p) {
 
 function mapU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.mapU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.mapU(m.data, f)
+  };
 }
 
 function map(m, f) {
@@ -187,9 +187,9 @@ function map(m, f) {
 
 function mapWithKeyU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.mapWithKeyU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.mapWithKeyU(m.data, f)
+  };
 }
 
 function mapWithKey(m, f) {
@@ -295,15 +295,15 @@ function getData(m) {
 function getId(m) {
   var cmp = m.cmp;
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function packIdData(id, data) {
   return {
-          cmp: id.cmp,
-          data: data
-        };
+    cmp: id.cmp,
+    data: data
+  };
 }
 
 var Int;
diff --git a/lib/es6/belt_MapDict.js b/lib/es6/belt_MapDict.js
index d9dd10f98f6..434cda87cd0 100644
--- a/lib/es6/belt_MapDict.js
+++ b/lib/es6/belt_MapDict.js
@@ -148,70 +148,70 @@ function splitAuxPivot(n, x, pres, cmp) {
   if (c === 0) {
     pres.contents = Caml_option.some(d);
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres, cmp);
     return [
-            match[0],
-            Belt_internalAVLtree.join(match[1], v, d, r)
-          ];
+      match[0],
+      Belt_internalAVLtree.join(match[1], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres, cmp);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(n, x, cmp) {
   if (n === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            undefined
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      undefined
+    ];
   }
   var pres = {
     contents: undefined
   };
   var v = splitAuxPivot(n, x, pres, cmp);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function mergeU(s1, s2, f, cmp) {
   if (s1 === undefined) {
     if (s2 !== undefined) {
       return Belt_internalAVLtree.keepMapU(s2, (function (k, v) {
-                    return f(k, undefined, Caml_option.some(v));
-                  }));
+              return f(k, undefined, Caml_option.some(v));
+            }));
     } else {
       return;
     }
   }
   if (s2 === undefined) {
     return Belt_internalAVLtree.keepMapU(s1, (function (k, v) {
-                  return f(k, Caml_option.some(v), undefined);
-                }));
+            return f(k, Caml_option.some(v), undefined);
+          }));
   }
   if (s1.h >= s2.h) {
     var v1 = s1.k;
diff --git a/lib/es6/belt_MutableMap.js b/lib/es6/belt_MutableMap.js
index c74195e6e76..8b548519754 100644
--- a/lib/es6/belt_MutableMap.js
+++ b/lib/es6/belt_MutableMap.js
@@ -142,9 +142,9 @@ function update(t, x, f) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function clear(m) {
@@ -262,9 +262,9 @@ function eq(m1, m2, cmp) {
 
 function mapU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_internalAVLtree.mapU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_internalAVLtree.mapU(m.data, f)
+  };
 }
 
 function map(m, f) {
@@ -273,9 +273,9 @@ function map(m, f) {
 
 function mapWithKeyU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_internalAVLtree.mapWithKeyU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_internalAVLtree.mapWithKeyU(m.data, f)
+  };
 }
 
 function mapWithKey(m, f) {
@@ -305,9 +305,9 @@ function has(m, x) {
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_internalAVLtree.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLtree.fromArray(data, cmp)
+  };
 }
 
 function set(m, e, v) {
diff --git a/lib/es6/belt_MutableMapInt.js b/lib/es6/belt_MutableMapInt.js
index 77fe903c3e4..c9b233fd2d1 100644
--- a/lib/es6/belt_MutableMapInt.js
+++ b/lib/es6/belt_MutableMapInt.js
@@ -7,8 +7,8 @@ import * as Belt_internalAVLtree from "./belt_internalAVLtree.js";
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -72,8 +72,8 @@ function forEach(d, f) {
 
 function mapU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapU(d.data, f)
+  };
 }
 
 function map(d, f) {
@@ -82,8 +82,8 @@ function map(d, f) {
 
 function mapWithKeyU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
+  };
 }
 
 function mapWithKey(d, f) {
@@ -277,8 +277,8 @@ function removeMany(d, xs) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalMapInt.fromArray(xs)
-        };
+    data: Belt_internalMapInt.fromArray(xs)
+  };
 }
 
 function cmpU(d0, d1, f) {
diff --git a/lib/es6/belt_MutableMapString.js b/lib/es6/belt_MutableMapString.js
index c70a373985d..3fa7d10aec7 100644
--- a/lib/es6/belt_MutableMapString.js
+++ b/lib/es6/belt_MutableMapString.js
@@ -7,8 +7,8 @@ import * as Belt_internalMapString from "./belt_internalMapString.js";
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -72,8 +72,8 @@ function forEach(d, f) {
 
 function mapU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapU(d.data, f)
+  };
 }
 
 function map(d, f) {
@@ -82,8 +82,8 @@ function map(d, f) {
 
 function mapWithKeyU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
+  };
 }
 
 function mapWithKey(d, f) {
@@ -277,8 +277,8 @@ function removeMany(d, xs) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalMapString.fromArray(xs)
-        };
+    data: Belt_internalMapString.fromArray(xs)
+  };
 }
 
 function cmpU(d0, d1, f) {
diff --git a/lib/es6/belt_MutableQueue.js b/lib/es6/belt_MutableQueue.js
index a28f4ae9fa2..4579e7dca80 100644
--- a/lib/es6/belt_MutableQueue.js
+++ b/lib/es6/belt_MutableQueue.js
@@ -5,10 +5,10 @@ import * as Caml_option from "./caml_option.js";
 
 function make(param) {
   return {
-          length: 0,
-          first: undefined,
-          last: undefined
-        };
+    length: 0,
+    first: undefined,
+    last: undefined
+  };
 }
 
 function clear(q) {
@@ -56,9 +56,9 @@ function peekExn(q) {
     return v.content;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function pop(q) {
@@ -91,9 +91,9 @@ function popExn(q) {
     }
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function popUndefined(q) {
diff --git a/lib/es6/belt_MutableSet.js b/lib/es6/belt_MutableSet.js
index f0c891cc2e6..7c3da364521 100644
--- a/lib/es6/belt_MutableSet.js
+++ b/lib/es6/belt_MutableSet.js
@@ -187,9 +187,9 @@ function mergeMany(d, xs) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -259,9 +259,9 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs, id) {
   return {
-          cmp: id.cmp,
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    cmp: id.cmp,
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -271,9 +271,9 @@ function checkInvariantInternal(d) {
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromArray(data, cmp)
+  };
 }
 
 function cmp(d0, d1) {
@@ -303,40 +303,40 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                cmp: cmp,
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                cmp: cmp,
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          cmp: cmp,
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          cmp: cmp,
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              cmp: cmp,
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              cmp: cmp,
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        cmp: cmp,
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        cmp: cmp,
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          cmp: d.cmp,
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    cmp: d.cmp,
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -347,15 +347,15 @@ function partitionU(d, p) {
   var cmp = d.cmp;
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -372,15 +372,15 @@ function intersect(a, b) {
   var match$1 = b.data;
   if (match === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   if (match$1 === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(match);
   var sizeb = Belt_internalAVLset.lengthNode(match$1);
@@ -390,16 +390,16 @@ function intersect(a, b) {
   Belt_internalAVLset.fillArray(match$1, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(a, b) {
@@ -408,15 +408,15 @@ function diff(a, b) {
   var match = b.data;
   if (dataa === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   if (match === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa);
   var sizeb = Belt_internalAVLset.lengthNode(match);
@@ -426,16 +426,16 @@ function diff(a, b) {
   Belt_internalAVLset.fillArray(match, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(a, b) {
@@ -444,15 +444,15 @@ function union(a, b) {
   var datab = b.data;
   if (dataa === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(datab)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(datab)
+    };
   }
   if (datab === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa);
   var sizeb = Belt_internalAVLset.lengthNode(datab);
@@ -462,16 +462,16 @@ function union(a, b) {
   Belt_internalAVLset.fillArray(datab, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -480,9 +480,9 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          cmp: d.cmp,
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    cmp: d.cmp,
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 var Int;
diff --git a/lib/es6/belt_MutableSetInt.js b/lib/es6/belt_MutableSetInt.js
index 645da29308a..b656b4f0632 100644
--- a/lib/es6/belt_MutableSetInt.js
+++ b/lib/es6/belt_MutableSetInt.js
@@ -185,8 +185,8 @@ function mergeMany(d, arr) {
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -256,8 +256,8 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs) {
   return {
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -266,8 +266,8 @@ function checkInvariantInternal(d) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalSetInt.fromArray(xs)
-        };
+    data: Belt_internalSetInt.fromArray(xs)
+  };
 }
 
 function cmp(d0, d1) {
@@ -296,35 +296,35 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -334,13 +334,13 @@ function keep(d, p) {
 function partitionU(d, p) {
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            data: match[0]
-          },
-          {
-            data: match[1]
-          }
-        ];
+    {
+      data: match[0]
+    },
+    {
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -356,13 +356,13 @@ function intersect(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -372,14 +372,14 @@ function intersect(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(dataa, datab) {
@@ -387,13 +387,13 @@ function diff(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -403,14 +403,14 @@ function diff(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(dataa, datab) {
@@ -418,13 +418,13 @@ function union(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(datab$1)
-          };
+      data: Belt_internalAVLset.copy(datab$1)
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -434,14 +434,14 @@ function union(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea]) {
     return {
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -450,8 +450,8 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 export {
diff --git a/lib/es6/belt_MutableSetString.js b/lib/es6/belt_MutableSetString.js
index eb81f96af27..1496359cc8c 100644
--- a/lib/es6/belt_MutableSetString.js
+++ b/lib/es6/belt_MutableSetString.js
@@ -185,8 +185,8 @@ function mergeMany(d, arr) {
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -256,8 +256,8 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs) {
   return {
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -266,8 +266,8 @@ function checkInvariantInternal(d) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalSetString.fromArray(xs)
-        };
+    data: Belt_internalSetString.fromArray(xs)
+  };
 }
 
 function cmp(d0, d1) {
@@ -296,35 +296,35 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -334,13 +334,13 @@ function keep(d, p) {
 function partitionU(d, p) {
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            data: match[0]
-          },
-          {
-            data: match[1]
-          }
-        ];
+    {
+      data: match[0]
+    },
+    {
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -356,13 +356,13 @@ function intersect(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -372,14 +372,14 @@ function intersect(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(dataa, datab) {
@@ -387,13 +387,13 @@ function diff(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -403,14 +403,14 @@ function diff(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(dataa, datab) {
@@ -418,13 +418,13 @@ function union(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(datab$1)
-          };
+      data: Belt_internalAVLset.copy(datab$1)
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -434,14 +434,14 @@ function union(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea]) {
     return {
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -450,8 +450,8 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 export {
diff --git a/lib/es6/belt_MutableStack.js b/lib/es6/belt_MutableStack.js
index fc09cfd9f92..8f3dcbcffcf 100644
--- a/lib/es6/belt_MutableStack.js
+++ b/lib/es6/belt_MutableStack.js
@@ -5,8 +5,8 @@ import * as Caml_option from "./caml_option.js";
 
 function make(param) {
   return {
-          root: undefined
-        };
+    root: undefined
+  };
 }
 
 function clear(s) {
@@ -15,8 +15,8 @@ function clear(s) {
 
 function copy(s) {
   return {
-          root: s.root
-        };
+    root: s.root
+  };
 }
 
 function push(s, x) {
diff --git a/lib/es6/belt_Option.js b/lib/es6/belt_Option.js
index e173c27c7ce..5b84c6d20e2 100644
--- a/lib/es6/belt_Option.js
+++ b/lib/es6/belt_Option.js
@@ -30,9 +30,9 @@ function getExn(x) {
     return Caml_option.valFromOption(x);
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function mapWithDefaultU(opt, $$default, f) {
diff --git a/lib/es6/belt_Result.js b/lib/es6/belt_Result.js
index 0066220b37e..1d6f8236240 100644
--- a/lib/es6/belt_Result.js
+++ b/lib/es6/belt_Result.js
@@ -7,9 +7,9 @@ function getExn(x) {
     return x._0;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function mapWithDefaultU(opt, $$default, f) {
@@ -27,14 +27,14 @@ function mapWithDefault(opt, $$default, f) {
 function mapU(opt, f) {
   if (opt.TAG === "Ok") {
     return {
-            TAG: "Ok",
-            _0: f(opt._0)
-          };
+      TAG: "Ok",
+      _0: f(opt._0)
+    };
   } else {
     return {
-            TAG: "Error",
-            _0: opt._0
-          };
+      TAG: "Error",
+      _0: opt._0
+    };
   }
 }
 
@@ -47,9 +47,9 @@ function flatMapU(opt, f) {
     return f(opt._0);
   } else {
     return {
-            TAG: "Error",
-            _0: opt._0
-          };
+      TAG: "Error",
+      _0: opt._0
+    };
   }
 }
 
diff --git a/lib/es6/belt_Set.js b/lib/es6/belt_Set.js
index 656c302607e..bfb458d5957 100644
--- a/lib/es6/belt_Set.js
+++ b/lib/es6/belt_Set.js
@@ -6,9 +6,9 @@ import * as Belt_SetDict from "./belt_SetDict.js";
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.fromArray(data, cmp)
+  };
 }
 
 function remove(m, e) {
@@ -19,9 +19,9 @@ function remove(m, e) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
@@ -33,50 +33,50 @@ function add(m, e) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
 function mergeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.mergeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.mergeMany(m.data, e, cmp)
+  };
 }
 
 function removeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.removeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.removeMany(m.data, e, cmp)
+  };
 }
 
 function union(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.union(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.union(m.data, n.data, cmp)
+  };
 }
 
 function intersect(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.intersect(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.intersect(m.data, n.data, cmp)
+  };
 }
 
 function diff(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.diff(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.diff(m.data, n.data, cmp)
+  };
 }
 
 function subset(m, n) {
@@ -89,25 +89,25 @@ function split(m, e) {
   var match = Belt_SetDict.split(m.data, e, cmp);
   var match$1 = match[0];
   return [
-          [
-            {
-              cmp: cmp,
-              data: match$1[0]
-            },
-            {
-              cmp: cmp,
-              data: match$1[1]
-            }
-          ],
-          match[1]
-        ];
+    [
+      {
+        cmp: cmp,
+        data: match$1[0]
+      },
+      {
+        cmp: cmp,
+        data: match$1[1]
+      }
+    ],
+    match[1]
+  ];
 }
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -157,9 +157,9 @@ function some(m, f) {
 
 function keepU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_SetDict.keepU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_SetDict.keepU(m.data, f)
+  };
 }
 
 function keep(m, f) {
@@ -170,15 +170,15 @@ function partitionU(m, f) {
   var match = Belt_SetDict.partitionU(m.data, f);
   var cmp = m.cmp;
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(m, f) {
@@ -231,9 +231,9 @@ function has(m, e) {
 
 function fromSortedArrayUnsafe(xs, id) {
   return {
-          cmp: id.cmp,
-          data: Belt_SetDict.fromSortedArrayUnsafe(xs)
-        };
+    cmp: id.cmp,
+    data: Belt_SetDict.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function getData(m) {
@@ -243,15 +243,15 @@ function getData(m) {
 function getId(m) {
   var cmp = m.cmp;
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function packIdData(id, data) {
   return {
-          cmp: id.cmp,
-          data: data
-        };
+    cmp: id.cmp,
+    data: data
+  };
 }
 
 function checkInvariantInternal(d) {
diff --git a/lib/es6/belt_SetDict.js b/lib/es6/belt_SetDict.js
index 4408f759f5d..8e66fec20a7 100644
--- a/lib/es6/belt_SetDict.js
+++ b/lib/es6/belt_SetDict.js
@@ -93,34 +93,34 @@ function splitAuxNoPivot(cmp, n, x) {
   var c = cmp(x, v);
   if (c === 0) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(cmp, l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(cmp, r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(cmp, n, x, pres) {
@@ -131,54 +131,54 @@ function splitAuxPivot(cmp, n, x, pres) {
   if (c === 0) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(cmp, l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(cmp, r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x, cmp) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(cmp, t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2, cmp) {
diff --git a/lib/es6/belt_SetInt.js b/lib/es6/belt_SetInt.js
index 62a0d624955..710d2bc3650 100644
--- a/lib/es6/belt_SetInt.js
+++ b/lib/es6/belt_SetInt.js
@@ -91,34 +91,34 @@ function splitAuxNoPivot(n, x) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(n, x, pres) {
@@ -128,54 +128,54 @@ function splitAuxPivot(n, x, pres) {
   if (x === v) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2) {
diff --git a/lib/es6/belt_SetString.js b/lib/es6/belt_SetString.js
index 186eb396ad8..a0d4f0a9f57 100644
--- a/lib/es6/belt_SetString.js
+++ b/lib/es6/belt_SetString.js
@@ -91,34 +91,34 @@ function splitAuxNoPivot(n, x) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(n, x, pres) {
@@ -128,54 +128,54 @@ function splitAuxPivot(n, x, pres) {
   if (x === v) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2) {
diff --git a/lib/es6/belt_internalAVLset.js b/lib/es6/belt_internalAVLset.js
index 26a891a0b53..29541baeb59 100644
--- a/lib/es6/belt_internalAVLset.js
+++ b/lib/es6/belt_internalAVLset.js
@@ -7,11 +7,11 @@ import * as Belt_SortArray from "./belt_SortArray.js";
 function copy(n) {
   if (n !== undefined) {
     return {
-            v: n.v,
-            h: n.h,
-            l: copy(n.l),
-            r: copy(n.r)
-          };
+      v: n.v,
+      h: n.h,
+      l: copy(n.l),
+      r: copy(n.r)
+    };
   } else {
     return n;
   }
@@ -21,22 +21,22 @@ function create(l, v, r) {
   var hl = l !== undefined ? l.h : 0;
   var hr = r !== undefined ? r.h : 0;
   return {
-          v: v,
-          h: (
-            hl >= hr ? hl : hr
-          ) + 1 | 0,
-          l: l,
-          r: r
-        };
+    v: v,
+    h: (
+      hl >= hr ? hl : hr
+    ) + 1 | 0,
+    l: l,
+    r: r
+  };
 }
 
 function singleton(x) {
   return {
-          v: x,
-          h: 1,
-          l: undefined,
-          r: undefined
-        };
+    v: x,
+    h: 1,
+    l: undefined,
+    r: undefined
+  };
 }
 
 function heightGe(l, r) {
@@ -65,13 +65,13 @@ function bal(l, v, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            v: v,
-            h: (
-              hl >= hr ? hl : hr
-            ) + 1 | 0,
-            l: l,
-            r: r
-          };
+      v: v,
+      h: (
+        hl >= hr ? hl : hr
+      ) + 1 | 0,
+      l: l,
+      r: r
+    };
   }
   var rl = r.l;
   var rr = r.r;
@@ -291,9 +291,9 @@ function concatShared(t1, t2) {
 function partitionSharedU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var value = n.v;
   var match = partitionSharedU(n.l, p);
@@ -305,14 +305,14 @@ function partitionSharedU(n, p) {
   var rt = match$1[0];
   if (pv) {
     return [
-            joinShared(lt, value, rt),
-            concatShared(lf, rf)
-          ];
+      joinShared(lt, value, rt),
+      concatShared(lf, rf)
+    ];
   } else {
     return [
-            concatShared(lt, rt),
-            joinShared(lf, value, rf)
-          ];
+      concatShared(lt, rt),
+      joinShared(lf, value, rf)
+    ];
   }
 }
 
@@ -371,14 +371,14 @@ function checkInvariantInternal(_v) {
     ) | 0;
     if (!(diff <= 2 && diff >= -2)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "belt_internalAVLset.res",
-              319,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "belt_internalAVLset.res",
+          319,
+          4
+        ],
+        Error: new Error()
+      };
     }
     checkInvariantInternal(l);
     _v = r;
@@ -469,21 +469,21 @@ function fromSortedArrayRevAux(arr, off, len) {
         var x0 = arr[off];
         var x1 = arr[off - 1 | 0];
         return {
-                v: x1,
-                h: 2,
-                l: singleton(x0),
-                r: undefined
-              };
+          v: x1,
+          h: 2,
+          l: singleton(x0),
+          r: undefined
+        };
     case 3 :
         var x0$1 = arr[off];
         var x1$1 = arr[off - 1 | 0];
         var x2 = arr[off - 2 | 0];
         return {
-                v: x1$1,
-                h: 2,
-                l: singleton(x0$1),
-                r: singleton(x2)
-              };
+          v: x1$1,
+          h: 2,
+          l: singleton(x0$1),
+          r: singleton(x2)
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayRevAux(arr, off, nl);
@@ -503,21 +503,21 @@ function fromSortedArrayAux(arr, off, len) {
         var x0 = arr[off];
         var x1 = arr[off + 1 | 0];
         return {
-                v: x1,
-                h: 2,
-                l: singleton(x0),
-                r: undefined
-              };
+          v: x1,
+          h: 2,
+          l: singleton(x0),
+          r: undefined
+        };
     case 3 :
         var x0$1 = arr[off];
         var x1$1 = arr[off + 1 | 0];
         var x2 = arr[off + 2 | 0];
         return {
-                v: x1$1,
-                h: 2,
-                l: singleton(x0$1),
-                r: singleton(x2)
-              };
+          v: x1$1,
+          h: 2,
+          l: singleton(x0$1),
+          r: singleton(x2)
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayAux(arr, off, nl);
@@ -573,9 +573,9 @@ function keepCopy(n, p) {
 function partitionCopyU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var size = lengthNode(n);
   var v = new Array(size);
@@ -587,9 +587,9 @@ function partitionCopyU(n, p) {
   fillArrayWithPartition(n, cursor, v, p);
   var forwardLen = cursor.forward;
   return [
-          fromSortedArrayAux(v, 0, forwardLen),
-          fromSortedArrayRevAux(v, backward, size - forwardLen | 0)
-        ];
+    fromSortedArrayAux(v, 0, forwardLen),
+    fromSortedArrayRevAux(v, backward, size - forwardLen | 0)
+  ];
 }
 
 function partitionCopy(n, p) {
@@ -733,9 +733,9 @@ function getExn(_n, x, cmp) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/es6/belt_internalAVLtree.js b/lib/es6/belt_internalAVLtree.js
index e8be3b96a82..93ff8403fff 100644
--- a/lib/es6/belt_internalAVLtree.js
+++ b/lib/es6/belt_internalAVLtree.js
@@ -15,12 +15,12 @@ function treeHeight(n) {
 function copy(n) {
   if (n !== undefined) {
     return {
-            k: n.k,
-            v: n.v,
-            h: n.h,
-            l: copy(n.l),
-            r: copy(n.r)
-          };
+      k: n.k,
+      v: n.v,
+      h: n.h,
+      l: copy(n.l),
+      r: copy(n.r)
+    };
   } else {
     return n;
   }
@@ -30,22 +30,22 @@ function create(l, x, d, r) {
   var hl = treeHeight(l);
   var hr = treeHeight(r);
   return {
-          k: x,
-          v: d,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
-          l: l,
-          r: r
-        };
+    k: x,
+    v: d,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
+    l: l,
+    r: r
+  };
 }
 
 function singleton(x, d) {
   return {
-          k: x,
-          v: d,
-          h: 1,
-          l: undefined,
-          r: undefined
-        };
+    k: x,
+    v: d,
+    h: 1,
+    l: undefined,
+    r: undefined
+  };
 }
 
 function heightGe(l, r) {
@@ -65,12 +65,12 @@ function updateValue(n, newValue) {
     return n;
   } else {
     return {
-            k: n.k,
-            v: newValue,
-            h: n.h,
-            l: n.l,
-            r: n.r
-          };
+      k: n.k,
+      v: newValue,
+      h: n.h,
+      l: n.l,
+      r: n.r
+    };
   }
 }
 
@@ -88,12 +88,12 @@ function bal(l, x, d, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            k: x,
-            v: d,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
-            l: l,
-            r: r
-          };
+      k: x,
+      v: d,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
+      l: l,
+      r: r
+    };
   }
   var rl = r.l;
   var rr = r.r;
@@ -162,9 +162,9 @@ function minKV0Aux(_n) {
     var n$1 = n.l;
     if (n$1 === undefined) {
       return [
-              n.k,
-              n.v
-            ];
+        n.k,
+        n.v
+      ];
     }
     _n = n$1;
     continue ;
@@ -191,9 +191,9 @@ function maxKV0Aux(_n) {
     var n$1 = n.r;
     if (n$1 === undefined) {
       return [
-              n.k,
-              n.v
-            ];
+        n.k,
+        n.v
+      ];
     }
     _n = n$1;
     continue ;
@@ -258,9 +258,9 @@ function findFirstByU(n, p) {
   var pvd = p(v, d);
   if (pvd) {
     return [
-            v,
-            d
-          ];
+      v,
+      d
+    ];
   }
   var right = findFirstByU(n.r, p);
   if (right !== undefined) {
@@ -298,12 +298,12 @@ function mapU(n, f) {
   var newD = f(n.v);
   var newRight = mapU(n.r, f);
   return {
-          k: n.k,
-          v: newD,
-          h: n.h,
-          l: newLeft,
-          r: newRight
-        };
+    k: n.k,
+    v: newD,
+    h: n.h,
+    l: newLeft,
+    r: newRight
+  };
 }
 
 function map(n, f) {
@@ -319,12 +319,12 @@ function mapWithKeyU(n, f) {
   var newD = f(key, n.v);
   var newRight = mapWithKeyU(n.r, f);
   return {
-          k: key,
-          v: newD,
-          h: n.h,
-          l: newLeft,
-          r: newRight
-        };
+    k: key,
+    v: newD,
+    h: n.h,
+    l: newLeft,
+    r: newRight
+  };
 }
 
 function mapWithKey(n, f) {
@@ -504,9 +504,9 @@ function keepMap(n, p) {
 function partitionSharedU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var key = n.k;
   var value = n.v;
@@ -519,14 +519,14 @@ function partitionSharedU(n, p) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, key, value, rt),
-            concat(lf, rf)
-          ];
+      join(lt, key, value, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, key, value, rf)
-          ];
+      concat(lt, rt),
+      join(lf, key, value, rf)
+    ];
   }
 }
 
@@ -588,14 +588,14 @@ function checkInvariantInternal(_v) {
     var diff = treeHeight(l) - treeHeight(r) | 0;
     if (!(diff <= 2 && diff >= -2)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "belt_internalAVLtree.res",
-              457,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "belt_internalAVLtree.res",
+          457,
+          4
+        ],
+        Error: new Error()
+      };
     }
     checkInvariantInternal(l);
     _v = r;
@@ -705,12 +705,12 @@ function fromSortedArrayRevAux(arr, off, len) {
         var match$1 = match_1;
         var match$2 = match_0;
         return {
-                k: match$1[0],
-                v: match$1[1],
-                h: 2,
-                l: singleton(match$2[0], match$2[1]),
-                r: undefined
-              };
+          k: match$1[0],
+          v: match$1[1],
+          h: 2,
+          l: singleton(match$2[0], match$2[1]),
+          r: undefined
+        };
     case 3 :
         var match_0$1 = arr[off];
         var match_1$1 = arr[off - 1 | 0];
@@ -719,12 +719,12 @@ function fromSortedArrayRevAux(arr, off, len) {
         var match$4 = match_1$1;
         var match$5 = match_0$1;
         return {
-                k: match$4[0],
-                v: match$4[1],
-                h: 2,
-                l: singleton(match$5[0], match$5[1]),
-                r: singleton(match$3[0], match$3[1])
-              };
+          k: match$4[0],
+          v: match$4[1],
+          h: 2,
+          l: singleton(match$5[0], match$5[1]),
+          r: singleton(match$3[0], match$3[1])
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayRevAux(arr, off, nl);
@@ -747,12 +747,12 @@ function fromSortedArrayAux(arr, off, len) {
         var match$1 = match_1;
         var match$2 = match_0;
         return {
-                k: match$1[0],
-                v: match$1[1],
-                h: 2,
-                l: singleton(match$2[0], match$2[1]),
-                r: undefined
-              };
+          k: match$1[0],
+          v: match$1[1],
+          h: 2,
+          l: singleton(match$2[0], match$2[1]),
+          r: undefined
+        };
     case 3 :
         var match_0$1 = arr[off];
         var match_1$1 = arr[off + 1 | 0];
@@ -761,12 +761,12 @@ function fromSortedArrayAux(arr, off, len) {
         var match$4 = match_1$1;
         var match$5 = match_0$1;
         return {
-                k: match$4[0],
-                v: match$4[1],
-                h: 2,
-                l: singleton(match$5[0], match$5[1]),
-                r: singleton(match$3[0], match$3[1])
-              };
+          k: match$4[0],
+          v: match$4[1],
+          h: 2,
+          l: singleton(match$5[0], match$5[1]),
+          r: singleton(match$3[0], match$3[1])
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayAux(arr, off, nl);
@@ -898,9 +898,9 @@ function getExn(_n, x, cmp) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/es6/belt_internalBuckets.js b/lib/es6/belt_internalBuckets.js
index 2b2e7bf6b54..008cd74a0ba 100644
--- a/lib/es6/belt_internalBuckets.js
+++ b/lib/es6/belt_internalBuckets.js
@@ -47,11 +47,11 @@ function copyBuckets(buckets) {
 
 function copy(x) {
   return {
-          size: x.size,
-          buckets: copyBuckets(x.buckets),
-          hash: x.hash,
-          eq: x.eq
-        };
+    size: x.size,
+    buckets: copyBuckets(x.buckets),
+    hash: x.hash,
+    eq: x.eq
+  };
 }
 
 function bucketLength(_accu, _buckets) {
@@ -118,13 +118,13 @@ function reduce(h, init, f) {
 
 function getMaxBucketLength(h) {
   return Belt_Array.reduceU(h.buckets, 0, (function (m, b) {
-                var len = bucketLength(0, b);
-                if (m > len) {
-                  return m;
-                } else {
-                  return len;
-                }
-              }));
+          var len = bucketLength(0, b);
+          if (m > len) {
+            return m;
+          } else {
+            return len;
+          }
+        }));
 }
 
 function getBucketHistogram(h) {
@@ -247,23 +247,23 @@ function linear(h, f) {
 
 function keysToArray(h) {
   return linear(h, (function (x) {
-                return x.key;
-              }));
+          return x.key;
+        }));
 }
 
 function valuesToArray(h) {
   return linear(h, (function (x) {
-                return x.value;
-              }));
+          return x.value;
+        }));
 }
 
 function toArray(h) {
   return linear(h, (function (x) {
-                return [
-                        x.key,
-                        x.value
-                      ];
-              }));
+          return [
+            x.key,
+            x.value
+          ];
+        }));
 }
 
 var C;
diff --git a/lib/es6/belt_internalBucketsType.js b/lib/es6/belt_internalBucketsType.js
index 4ce28afce58..386b0bfd518 100644
--- a/lib/es6/belt_internalBucketsType.js
+++ b/lib/es6/belt_internalBucketsType.js
@@ -18,11 +18,11 @@ function power_2_above(_x, n) {
 function make(hash, eq, hintSize) {
   var s = power_2_above(16, hintSize);
   return {
-          size: 0,
-          buckets: new Array(s),
-          hash: hash,
-          eq: eq
-        };
+    size: 0,
+    buckets: new Array(s),
+    hash: hash,
+    eq: eq
+  };
 }
 
 function clear(h) {
diff --git a/lib/es6/belt_internalMapInt.js b/lib/es6/belt_internalMapInt.js
index 68b22e84dc9..9c1c664d111 100644
--- a/lib/es6/belt_internalMapInt.js
+++ b/lib/es6/belt_internalMapInt.js
@@ -64,9 +64,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -137,39 +137,39 @@ function splitAux(x, n) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              undefined,
-              n
-            ];
+        undefined,
+        undefined,
+        n
+      ];
     }
     var match = splitAux(x, l);
     return [
-            match[0],
-            match[1],
-            Belt_internalAVLtree.join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      Belt_internalAVLtree.join(match[2], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined,
-            undefined
-          ];
+      n,
+      undefined,
+      undefined
+    ];
   }
   var match$1 = splitAux(x, r);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function split(x, n) {
@@ -177,10 +177,10 @@ function split(x, n) {
     return splitAux(x, n);
   } else {
     return [
-            undefined,
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined,
+      undefined
+    ];
   }
 }
 
diff --git a/lib/es6/belt_internalMapString.js b/lib/es6/belt_internalMapString.js
index d2f0e913b75..f0ea1256638 100644
--- a/lib/es6/belt_internalMapString.js
+++ b/lib/es6/belt_internalMapString.js
@@ -64,9 +64,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -137,39 +137,39 @@ function splitAux(x, n) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              undefined,
-              n
-            ];
+        undefined,
+        undefined,
+        n
+      ];
     }
     var match = splitAux(x, l);
     return [
-            match[0],
-            match[1],
-            Belt_internalAVLtree.join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      Belt_internalAVLtree.join(match[2], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined,
-            undefined
-          ];
+      n,
+      undefined,
+      undefined
+    ];
   }
   var match$1 = splitAux(x, r);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function split(x, n) {
@@ -177,10 +177,10 @@ function split(x, n) {
     return splitAux(x, n);
   } else {
     return [
-            undefined,
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined,
+      undefined
+    ];
   }
 }
 
diff --git a/lib/es6/belt_internalSetBuckets.js b/lib/es6/belt_internalSetBuckets.js
index c70aa987d18..7f795bf85dd 100644
--- a/lib/es6/belt_internalSetBuckets.js
+++ b/lib/es6/belt_internalSetBuckets.js
@@ -44,11 +44,11 @@ function copyBuckets(buckets) {
 
 function copy(x) {
   return {
-          size: x.size,
-          buckets: copyBuckets(x.buckets),
-          hash: x.hash,
-          eq: x.eq
-        };
+    size: x.size,
+    buckets: copyBuckets(x.buckets),
+    hash: x.hash,
+    eq: x.eq
+  };
 }
 
 function bucketLength(_accu, _buckets) {
@@ -144,13 +144,13 @@ function reduce(h, init, f) {
 
 function getMaxBucketLength(h) {
   return Belt_Array.reduceU(h.buckets, 0, (function (m, b) {
-                var len = bucketLength(0, b);
-                if (m > len) {
-                  return m;
-                } else {
-                  return len;
-                }
-              }));
+          var len = bucketLength(0, b);
+          if (m > len) {
+            return m;
+          } else {
+            return len;
+          }
+        }));
 }
 
 function getBucketHistogram(h) {
diff --git a/lib/es6/belt_internalSetInt.js b/lib/es6/belt_internalSetInt.js
index 65e3fe2d097..afe7a7f67a9 100644
--- a/lib/es6/belt_internalSetInt.js
+++ b/lib/es6/belt_internalSetInt.js
@@ -142,9 +142,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/es6/belt_internalSetString.js b/lib/es6/belt_internalSetString.js
index 12c039d35b4..2e8645ab93e 100644
--- a/lib/es6/belt_internalSetString.js
+++ b/lib/es6/belt_internalSetString.js
@@ -142,9 +142,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/es6/buffer.js b/lib/es6/buffer.js
index 21b3181a2aa..3cbed4be2e1 100644
--- a/lib/es6/buffer.js
+++ b/lib/es6/buffer.js
@@ -10,11 +10,11 @@ function create(n) {
   var n$1 = n < 1 ? 1 : n;
   var s = Caml_bytes.create(n$1);
   return {
-          buffer: s,
-          position: 0,
-          length: n$1,
-          initial_buffer: s
-        };
+    buffer: s,
+    position: 0,
+    length: n$1,
+    initial_buffer: s
+  };
 }
 
 function contents(b) {
@@ -28,10 +28,10 @@ function to_bytes(b) {
 function sub(b, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (b.position - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.sub",
+      Error: new Error()
+    };
   }
   return Bytes.sub_string(b.buffer, ofs, len);
 }
@@ -39,10 +39,10 @@ function sub(b, ofs, len) {
 function blit(src, srcoff, dst, dstoff, len) {
   if (len < 0 || srcoff < 0 || srcoff > (src.position - len | 0) || dstoff < 0 || dstoff > (dst.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.blit",
+      Error: new Error()
+    };
   }
   Bytes.blit(src.buffer, srcoff, dst, dstoff, len);
 }
@@ -50,10 +50,10 @@ function blit(src, srcoff, dst, dstoff, len) {
 function nth(b, ofs) {
   if (ofs < 0 || ofs >= b.position) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.nth",
+      Error: new Error()
+    };
   }
   return b.buffer[ofs];
 }
@@ -97,14 +97,14 @@ function add_utf_8_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            98,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        98,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 127) {
     return add_char(b, u$1);
@@ -143,28 +143,28 @@ function add_utf_8_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          127,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      127,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_utf_16be_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            132,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        132,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 65535) {
     var pos = b.position;
@@ -192,28 +192,28 @@ function add_utf_16be_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          154,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      154,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_utf_16le_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            159,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        159,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 65535) {
     var pos = b.position;
@@ -241,23 +241,23 @@ function add_utf_16le_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          181,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      181,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_substring(b, s, offset, len) {
   if (offset < 0 || len < 0 || offset > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.add_substring/add_subbytes",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.add_substring/add_subbytes",
+      Error: new Error()
+    };
   }
   var new_position = b.position + len | 0;
   if (new_position > b.length) {
@@ -297,14 +297,14 @@ function closing(param) {
     return /* '}' */125;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          216,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      216,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function advance_to_closing(opening, closing, k, s, start) {
@@ -316,9 +316,9 @@ function advance_to_closing(opening, closing, k, s, start) {
     var k$1 = _k;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (Caml_string.get(s, i) === opening) {
       _i = i + 1 | 0;
@@ -373,24 +373,24 @@ function advance_to_non_alpha(s, start) {
 function find_ident(s, start, lim) {
   if (start >= lim) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var c = Caml_string.get(s, start);
   if (c !== 40 && c !== 123) {
     var stop = advance_to_non_alpha(s, start + 1 | 0);
     return [
-            $$String.sub(s, start, stop - start | 0),
-            stop
-          ];
+      $$String.sub(s, start, stop - start | 0),
+      stop
+    ];
   }
   var new_start = start + 1 | 0;
   var stop$1 = advance_to_closing(c, closing(c), 0, s, new_start);
   return [
-          $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0),
-          stop$1 + 1 | 0
-        ];
+    $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0),
+    stop$1 + 1 | 0
+  ];
 }
 
 function add_substitute(b, f, s) {
@@ -444,10 +444,10 @@ function add_substitute(b, f, s) {
 function truncate(b, len) {
   if (len < 0 || len > b.position) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.truncate",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.truncate",
+      Error: new Error()
+    };
   }
   b.position = len;
 }
diff --git a/lib/es6/bytes.js b/lib/es6/bytes.js
index d09948f76e9..b0717e118ad 100644
--- a/lib/es6/bytes.js
+++ b/lib/es6/bytes.js
@@ -112,10 +112,10 @@ function of_string(s) {
 function sub(s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.sub / Bytes.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.sub / Bytes.sub",
+      Error: new Error()
+    };
   }
   var r = Caml_bytes.create(len);
   unsafe_blit(s, ofs, r, 0, len);
@@ -139,20 +139,20 @@ function $plus$plus(a, b) {
       return c;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   if (match$1) {
     return c;
   }
   if (match$2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   return c;
 }
@@ -179,10 +179,10 @@ function extend(s, left, right) {
 function fill(s, ofs, len, c) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.fill / Bytes.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.fill / Bytes.fill",
+      Error: new Error()
+    };
   }
   unsafe_fill(s, ofs, len, c);
 }
@@ -190,10 +190,10 @@ function fill(s, ofs, len, c) {
 function blit(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.blit",
+      Error: new Error()
+    };
   }
   unsafe_blit(s1, ofs1, s2, ofs2, len);
 }
@@ -201,10 +201,10 @@ function blit(s1, ofs1, s2, ofs2, len) {
 function blit_string(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.blit / Bytes.blit_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.blit / Bytes.blit_string",
+      Error: new Error()
+    };
   }
   if (len <= 0) {
     return;
@@ -241,10 +241,10 @@ function ensure_ge(x, y) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Bytes.concat",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Bytes.concat",
+    Error: new Error()
+  };
 }
 
 function sum_lengths(_acc, seplen, _param) {
@@ -486,9 +486,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -524,10 +524,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -536,10 +536,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -549,9 +549,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -568,10 +568,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -597,10 +597,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -609,10 +609,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -634,10 +634,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
diff --git a/lib/es6/bytesLabels.js b/lib/es6/bytesLabels.js
index d09948f76e9..b0717e118ad 100644
--- a/lib/es6/bytesLabels.js
+++ b/lib/es6/bytesLabels.js
@@ -112,10 +112,10 @@ function of_string(s) {
 function sub(s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.sub / Bytes.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.sub / Bytes.sub",
+      Error: new Error()
+    };
   }
   var r = Caml_bytes.create(len);
   unsafe_blit(s, ofs, r, 0, len);
@@ -139,20 +139,20 @@ function $plus$plus(a, b) {
       return c;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   if (match$1) {
     return c;
   }
   if (match$2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   return c;
 }
@@ -179,10 +179,10 @@ function extend(s, left, right) {
 function fill(s, ofs, len, c) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.fill / Bytes.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.fill / Bytes.fill",
+      Error: new Error()
+    };
   }
   unsafe_fill(s, ofs, len, c);
 }
@@ -190,10 +190,10 @@ function fill(s, ofs, len, c) {
 function blit(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.blit",
+      Error: new Error()
+    };
   }
   unsafe_blit(s1, ofs1, s2, ofs2, len);
 }
@@ -201,10 +201,10 @@ function blit(s1, ofs1, s2, ofs2, len) {
 function blit_string(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.blit / Bytes.blit_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.blit / Bytes.blit_string",
+      Error: new Error()
+    };
   }
   if (len <= 0) {
     return;
@@ -241,10 +241,10 @@ function ensure_ge(x, y) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Bytes.concat",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Bytes.concat",
+    Error: new Error()
+  };
 }
 
 function sum_lengths(_acc, seplen, _param) {
@@ -486,9 +486,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -524,10 +524,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -536,10 +536,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -549,9 +549,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -568,10 +568,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -597,10 +597,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -609,10 +609,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -634,10 +634,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
diff --git a/lib/es6/caml_array.js b/lib/es6/caml_array.js
index fc57597f7db..68cadf144a6 100644
--- a/lib/es6/caml_array.js
+++ b/lib/es6/caml_array.js
@@ -58,10 +58,10 @@ function concat(l) {
 function set(xs, index, newval) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   xs[index] = newval;
 }
@@ -69,10 +69,10 @@ function set(xs, index, newval) {
 function get(xs, index) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return xs[index];
 }
diff --git a/lib/es6/caml_bigint.js b/lib/es6/caml_bigint.js
index fe1270a4207..098bf20b674 100644
--- a/lib/es6/caml_bigint.js
+++ b/lib/es6/caml_bigint.js
@@ -4,9 +4,9 @@
 function div(x, y) {
   if (y === 0n) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x / y;
 }
@@ -14,9 +14,9 @@ function div(x, y) {
 function mod_(x, y) {
   if (y === 0n) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x % y;
 }
diff --git a/lib/es6/caml_bytes.js b/lib/es6/caml_bytes.js
index 9833141f904..0e001148e2c 100644
--- a/lib/es6/caml_bytes.js
+++ b/lib/es6/caml_bytes.js
@@ -4,10 +4,10 @@
 function set(s, i, ch) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   s[i] = ch;
 }
@@ -15,10 +15,10 @@ function set(s, i, ch) {
 function get(s, i) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return s[i];
 }
@@ -26,10 +26,10 @@ function get(s, i) {
 function create(len) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.create",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.create",
+      Error: new Error()
+    };
   }
   var result = new Array(len);
   for(var i = 0; i < len; ++i){
diff --git a/lib/es6/caml_float.js b/lib/es6/caml_float.js
index c5576c87358..301cfec2b96 100644
--- a/lib/es6/caml_float.js
+++ b/lib/es6/caml_float.js
@@ -13,14 +13,14 @@ function modf_float(x) {
   if (!isFinite(x)) {
     if (isNaN(x)) {
       return [
-              NaN,
-              NaN
-            ];
+        NaN,
+        NaN
+      ];
     } else {
       return [
-              1 / x,
-              x
-            ];
+        1 / x,
+        x
+      ];
     }
   }
   var neg = 1 / x < 0;
@@ -29,14 +29,14 @@ function modf_float(x) {
   var f = x$1 - i;
   if (neg) {
     return [
-            - f,
-            - i
-          ];
+      - f,
+      - i
+    ];
   } else {
     return [
-            f,
-            i
-          ];
+      f,
+      i
+    ];
   }
 }
 
@@ -61,9 +61,9 @@ function ldexp_float(x, exp) {
 function frexp_float(x) {
   if (x === 0 || !isFinite(x)) {
     return [
-            x,
-            0
-          ];
+      x,
+      0
+    ];
   }
   var neg = x < 0;
   var x$p = Math.abs(x);
@@ -77,9 +77,9 @@ function frexp_float(x) {
     x$p = - x$p;
   }
   return [
-          x$p,
-          exp | 0
-        ];
+    x$p,
+    exp | 0
+  ];
 }
 
 function copysign_float(x, y) {
diff --git a/lib/es6/caml_format.js b/lib/es6/caml_format.js
index 55b09201cce..b69b3c5a862 100644
--- a/lib/es6/caml_format.js
+++ b/lib/es6/caml_format.js
@@ -119,10 +119,10 @@ function parse_sign_and_base(s) {
     }
   }
   return [
-          i,
-          sign,
-          base
-        ];
+    i,
+    sign,
+    base
+  ];
 }
 
 function int_of_string(s) {
@@ -135,10 +135,10 @@ function int_of_string(s) {
   var d = parse_digit(c);
   if (d < 0 || d >= base) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int_of_string",
+      Error: new Error()
+    };
   }
   var aux = function (_acc, _k) {
     while(true) {
@@ -155,18 +155,18 @@ function int_of_string(s) {
       var v = parse_digit(a);
       if (v < 0 || v >= base) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int_of_string",
+          Error: new Error()
+        };
       }
       var acc$1 = base * acc + v;
       if (acc$1 > threshold) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int_of_string",
+          Error: new Error()
+        };
       }
       _k = k + 1 | 0;
       _acc = acc$1;
@@ -177,10 +177,10 @@ function int_of_string(s) {
   var or_res = res | 0;
   if (base === 10 && res !== or_res) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int_of_string",
+      Error: new Error()
+    };
   }
   return or_res;
 }
@@ -221,10 +221,10 @@ function int64_of_string(s) {
   var d = Caml_int64.of_int32(parse_digit(c));
   if (Caml.i64_lt(d, Caml_int64.zero) || Caml.i64_ge(d, base)) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int64_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int64_of_string",
+      Error: new Error()
+    };
   }
   var aux = function (_acc, _k) {
     while(true) {
@@ -241,10 +241,10 @@ function int64_of_string(s) {
       var v = Caml_int64.of_int32(parse_digit(a));
       if (Caml.i64_lt(v, Caml_int64.zero) || Caml.i64_ge(v, base) || Caml.i64_gt(acc, threshold)) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int64_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int64_of_string",
+          Error: new Error()
+        };
       }
       var acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v);
       _k = k + 1 | 0;
@@ -259,10 +259,10 @@ function int64_of_string(s) {
           10
         ]) && Caml.i64_neq(res, or_res)) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int64_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int64_of_string",
+      Error: new Error()
+    };
   }
   return or_res;
 }
@@ -291,10 +291,10 @@ function parse_format(fmt) {
   var len = fmt.length;
   if (len > 31) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "format_int: format too long",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "format_int: format too long",
+      Error: new Error()
+    };
   }
   var f = {
     justify: "+",
@@ -786,9 +786,9 @@ var float_of_string = (function(s,exn){
 
 function float_of_string$1(s) {
   return float_of_string(s, {
-              RE_EXN_ID: "Failure",
-              _1: "float_of_string"
-            });
+        RE_EXN_ID: "Failure",
+        _1: "float_of_string"
+      });
 }
 
 export {
diff --git a/lib/es6/caml_int32.js b/lib/es6/caml_int32.js
index b9ea66bd933..adc5a19e405 100644
--- a/lib/es6/caml_int32.js
+++ b/lib/es6/caml_int32.js
@@ -4,9 +4,9 @@
 function div(x, y) {
   if (y === 0) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x / y | 0;
 }
@@ -14,9 +14,9 @@ function div(x, y) {
 function mod_(x, y) {
   if (y === 0) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x % y;
 }
diff --git a/lib/es6/caml_int64.js b/lib/es6/caml_int64.js
index d14352ef090..6d87e6bc308 100644
--- a/lib/es6/caml_int64.js
+++ b/lib/es6/caml_int64.js
@@ -4,9 +4,9 @@ import * as Caml from "./caml.js";
 
 function mk(lo, hi) {
   return [
-          hi,
-          (lo >>> 0)
-        ];
+    hi,
+    (lo >>> 0)
+  ];
 }
 
 var min_int = [
@@ -47,21 +47,21 @@ function succ(param) {
   var x_hi = param[0];
   var lo = x_lo + 1 | 0;
   return [
-          x_hi + (
-            lo === 0 ? 1 : 0
-          ) | 0,
-          (lo >>> 0)
-        ];
+    x_hi + (
+      lo === 0 ? 1 : 0
+    ) | 0,
+    (lo >>> 0)
+  ];
 }
 
 function neg(param) {
   var other_lo = (param[1] ^ -1) + 1 | 0;
   return [
-          (param[0] ^ -1) + (
-            other_lo === 0 ? 1 : 0
-          ) | 0,
-          (other_lo >>> 0)
-        ];
+    (param[0] ^ -1) + (
+      other_lo === 0 ? 1 : 0
+    ) | 0,
+    (other_lo >>> 0)
+  ];
 }
 
 function add_aux(param, y_lo, y_hi) {
@@ -69,9 +69,9 @@ function add_aux(param, y_lo, y_hi) {
   var lo = x_lo + y_lo | 0;
   var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0;
   return [
-          param[0] + y_hi + overflow | 0,
-          (lo >>> 0)
-        ];
+    param[0] + y_hi + overflow | 0,
+    (lo >>> 0)
+  ];
 }
 
 function add(self, param) {
@@ -129,14 +129,14 @@ function lsl_(x, numBits) {
   var lo = x[1];
   if (numBits >= 32) {
     return [
-            (lo << (numBits - 32 | 0)),
-            0
-          ];
+      (lo << (numBits - 32 | 0)),
+      0
+    ];
   } else {
     return [
-            (lo >>> (32 - numBits | 0)) | (x[0] << numBits),
-            ((lo << numBits) >>> 0)
-          ];
+      (lo >>> (32 - numBits | 0)) | (x[0] << numBits),
+      ((lo << numBits) >>> 0)
+    ];
   }
 }
 
@@ -148,19 +148,19 @@ function lsr_(x, numBits) {
   var offset = numBits - 32 | 0;
   if (offset === 0) {
     return [
-            0,
-            (hi >>> 0)
-          ];
+      0,
+      (hi >>> 0)
+    ];
   } else if (offset > 0) {
     return [
-            0,
-            (hi >>> offset)
-          ];
+      0,
+      (hi >>> offset)
+    ];
   } else {
     return [
-            (hi >>> numBits),
-            (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0)
-          ];
+      (hi >>> numBits),
+      (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0)
+    ];
   }
 }
 
@@ -171,14 +171,14 @@ function asr_(x, numBits) {
   var hi = x[0];
   if (numBits < 32) {
     return [
-            (hi >> numBits),
-            (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0)
-          ];
+      (hi >> numBits),
+      (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0)
+    ];
   } else {
     return [
-            hi >= 0 ? 0 : -1,
-            ((hi >> (numBits - 32 | 0)) >>> 0)
-          ];
+      hi >= 0 ? 0 : -1,
+      ((hi >> (numBits - 32 | 0)) >>> 0)
+    ];
   }
 }
 
@@ -270,9 +270,9 @@ function mul(_this, _other) {
         c32 = c32 & 65535;
         c48 = c48 + (a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48) & 65535;
         return [
-                c32 | (c48 << 16),
-                ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0)
-              ];
+          c32 | (c48 << 16),
+          ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0)
+        ];
       }
       
     }
@@ -286,23 +286,23 @@ function mul(_this, _other) {
 
 function xor(param, param$1) {
   return [
-          param[0] ^ param$1[0],
-          ((param[1] ^ param$1[1]) >>> 0)
-        ];
+    param[0] ^ param$1[0],
+    ((param[1] ^ param$1[1]) >>> 0)
+  ];
 }
 
 function or_(param, param$1) {
   return [
-          param[0] | param$1[0],
-          ((param[1] | param$1[1]) >>> 0)
-        ];
+    param[0] | param$1[0],
+    ((param[1] | param$1[1]) >>> 0)
+  ];
 }
 
 function and_(param, param$1) {
   return [
-          param[0] & param$1[0],
-          ((param[1] & param$1[1]) >>> 0)
-        ];
+    param[0] & param$1[0],
+    ((param[1] & param$1[1]) >>> 0)
+  ];
 }
 
 function to_float(param) {
@@ -325,9 +325,9 @@ function of_float(x) {
   var hi = x / 4294967296 | 0;
   var lo = x % 4294967296 | 0;
   return [
-          hi,
-          (lo >>> 0)
-        ];
+    hi,
+    (lo >>> 0)
+  ];
 }
 
 function isSafeInteger(param) {
@@ -384,9 +384,9 @@ function div(_self, _other) {
       exit$1 = 2;
     } else {
       throw {
-            RE_EXN_ID: "Division_by_zero",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Division_by_zero",
+        Error: new Error()
+      };
     }
     if (exit$1 === 2) {
       if (self_hi !== -2147483648) {
@@ -487,9 +487,9 @@ function mod_(self, other) {
 function div_mod(self, other) {
   var quotient = div(self, other);
   return [
-          quotient,
-          sub(self, mul(quotient, other))
-        ];
+    quotient,
+    sub(self, mul(quotient, other))
+  ];
 }
 
 function compare(self, other) {
@@ -514,9 +514,9 @@ function compare(self, other) {
 
 function of_int32(lo) {
   return [
-          lo < 0 ? -1 : 0,
-          (lo >>> 0)
-        ];
+    lo < 0 ? -1 : 0,
+    (lo >>> 0)
+  ];
 }
 
 function to_int32(x) {
@@ -549,9 +549,9 @@ function to_hex(x) {
 
 function discard_sign(x) {
   return [
-          2147483647 & x[0],
-          x[1]
-        ];
+    2147483647 & x[0],
+    x[1]
+  ];
 }
 
 function float_of_bits(x) {
@@ -561,9 +561,9 @@ function float_of_bits(x) {
 function bits_of_float(x) {
   var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x);
   return [
-          match[1],
-          (match[0] >>> 0)
-        ];
+    match[1],
+    (match[0] >>> 0)
+  ];
 }
 
 export {
diff --git a/lib/es6/caml_js_exceptions.js b/lib/es6/caml_js_exceptions.js
index 24674714f46..27d32d1ab8c 100644
--- a/lib/es6/caml_js_exceptions.js
+++ b/lib/es6/caml_js_exceptions.js
@@ -10,9 +10,9 @@ function internalToOCamlException(e) {
     return e;
   } else {
     return {
-            RE_EXN_ID: "JsError",
-            _1: e
-          };
+      RE_EXN_ID: "JsError",
+      _1: e
+    };
   }
 }
 
diff --git a/lib/es6/caml_lexer.js b/lib/es6/caml_lexer.js
index b9bbfa9da1e..019412debfc 100644
--- a/lib/es6/caml_lexer.js
+++ b/lib/es6/caml_lexer.js
@@ -105,9 +105,9 @@ var empty_token_lit = "lexing: empty token";
 
 function lex_engine(tbls, i, buf) {
   return caml_lex_engine_aux(tbls, i, buf, {
-              RE_EXN_ID: "Failure",
-              _1: empty_token_lit
-            });
+        RE_EXN_ID: "Failure",
+        _1: empty_token_lit
+      });
 }
 
 /***********************************************/
@@ -246,9 +246,9 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
 
 function new_lex_engine(tbl, i, buf) {
   return caml_new_lex_engine_aux(tbl, i, buf, {
-              RE_EXN_ID: "Failure",
-              _1: empty_token_lit
-            });
+        RE_EXN_ID: "Failure",
+        _1: empty_token_lit
+      });
 }
 
 export {
diff --git a/lib/es6/caml_module.js b/lib/es6/caml_module.js
index 09b215bca03..6bea562ec0a 100644
--- a/lib/es6/caml_module.js
+++ b/lib/es6/caml_module.js
@@ -5,10 +5,10 @@ import * as Caml_obj from "./caml_obj.js";
 function init_mod(loc, shape) {
   var undef_module = function (param) {
     throw {
-          RE_EXN_ID: "Undefined_recursive_module",
-          _1: loc,
-          Error: new Error()
-        };
+      RE_EXN_ID: "Undefined_recursive_module",
+      _1: loc,
+      Error: new Error()
+    };
   };
   var loop = function (shape, struct_, idx) {
     if (typeof shape !== "object") {
@@ -76,14 +76,14 @@ function update_mod(shape, o, n) {
   };
   if (typeof shape !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "caml_module.res",
-            109,
-            9
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "caml_module.res",
+        109,
+        9
+      ],
+      Error: new Error()
+    };
   }
   if (shape.TAG === "Module") {
     var comps = shape._0;
@@ -95,14 +95,14 @@ function update_mod(shape, o, n) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "caml_module.res",
-          109,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "caml_module.res",
+      109,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 export {
diff --git a/lib/es6/caml_obj.js b/lib/es6/caml_obj.js
index 53f1fb966cb..f50ed32ffbb 100644
--- a/lib/es6/caml_obj.js
+++ b/lib/es6/caml_obj.js
@@ -56,10 +56,10 @@ function compare(a, b) {
     case "function" :
         if (b_type === "function") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "compare: functional value",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "compare: functional value",
+            Error: new Error()
+          };
         }
         break;
     case "number" :
@@ -138,10 +138,10 @@ function compare(a, b) {
       }
       if (tag_a === 251) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "equal: abstract value",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "equal: abstract value",
+          Error: new Error()
+        };
       }
       if (tag_a !== tag_b) {
         if (tag_a < tag_b) {
@@ -269,10 +269,10 @@ function equal(a, b) {
   var b_type = typeof b;
   if (a_type === "function" || b_type === "function") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "equal: functional value",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "equal: functional value",
+      Error: new Error()
+    };
   }
   if (b_type === "number" || b_type === "bigint" || b_type === "undefined" || b === null) {
     return false;
@@ -284,10 +284,10 @@ function equal(a, b) {
   }
   if (tag_a === 251) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "equal: abstract value",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "equal: abstract value",
+      Error: new Error()
+    };
   }
   if (tag_a !== tag_b) {
     return false;
diff --git a/lib/es6/caml_option.js b/lib/es6/caml_option.js
index 2aa092c71fd..b0e9e730a03 100644
--- a/lib/es6/caml_option.js
+++ b/lib/es6/caml_option.js
@@ -8,12 +8,12 @@ function isNested(x) {
 function some(x) {
   if (x === undefined) {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: 0
+    };
   } else if (x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined) {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0
+    };
   } else {
     return x;
   }
@@ -52,8 +52,8 @@ function valFromOption(x) {
     return;
   } else {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0
+    };
   }
 }
 
diff --git a/lib/es6/caml_string.js b/lib/es6/caml_string.js
index 421ec16dd1f..741ccb6ddf8 100644
--- a/lib/es6/caml_string.js
+++ b/lib/es6/caml_string.js
@@ -4,10 +4,10 @@
 function get(s, i) {
   if (i >= s.length || i < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return s.codePointAt(i);
 }
diff --git a/lib/es6/caml_sys.js b/lib/es6/caml_sys.js
index 76bdf10c17a..cc50a080321 100644
--- a/lib/es6/caml_sys.js
+++ b/lib/es6/caml_sys.js
@@ -4,18 +4,18 @@
 function sys_getenv(s) {
   if (typeof process === "undefined" || process.env === undefined) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var x = process.env[s];
   if (x !== undefined) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var os_type = (function(_){
@@ -45,21 +45,21 @@ var sys_getcwd = (function(param){
 function sys_get_argv(param) {
   if (typeof process === "undefined") {
     return [
-            "",
-            [""]
-          ];
+      "",
+      [""]
+    ];
   }
   var argv = process.argv;
   if (argv == null) {
     return [
-            "",
-            [""]
-          ];
+      "",
+      [""]
+    ];
   } else {
     return [
-            argv[0],
-            argv
-          ];
+      argv[0],
+      argv
+    ];
   }
 }
 
@@ -72,18 +72,18 @@ function sys_exit(exit_code) {
 
 function sys_is_directory(_s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "sys_is_directory not implemented",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "sys_is_directory not implemented",
+    Error: new Error()
+  };
 }
 
 function sys_file_exists(_s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "sys_file_exists not implemented",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "sys_file_exists not implemented",
+    Error: new Error()
+  };
 }
 
 export {
diff --git a/lib/es6/camlinternalLazy.js b/lib/es6/camlinternalLazy.js
index c83636531e7..b9c502817a7 100644
--- a/lib/es6/camlinternalLazy.js
+++ b/lib/es6/camlinternalLazy.js
@@ -17,9 +17,9 @@ function forward_with_closure(blk, closure) {
 
 function raise_undefined() {
   throw {
-        RE_EXN_ID: Undefined,
-        Error: new Error()
-      };
+    RE_EXN_ID: Undefined,
+    Error: new Error()
+  };
 }
 
 function force(lzv) {
@@ -52,16 +52,16 @@ function force_val(lzv) {
 
 function from_fun(closure) {
   return {
-          LAZY_DONE: false,
-          VAL: closure
-        };
+    LAZY_DONE: false,
+    VAL: closure
+  };
 }
 
 function from_val(value) {
   return {
-          LAZY_DONE: true,
-          VAL: value
-        };
+    LAZY_DONE: true,
+    VAL: value
+  };
 }
 
 export {
diff --git a/lib/es6/char.js b/lib/es6/char.js
index 6b50aaeca76..a110d607148 100644
--- a/lib/es6/char.js
+++ b/lib/es6/char.js
@@ -5,10 +5,10 @@ import * as Bytes from "./bytes.js";
 function chr(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Char.chr",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Char.chr",
+      Error: new Error()
+    };
   }
   return n;
 }
diff --git a/lib/es6/complex.js b/lib/es6/complex.js
index f08efc6ca06..7f461dcb106 100644
--- a/lib/es6/complex.js
+++ b/lib/es6/complex.js
@@ -8,37 +8,37 @@ var one = {
 
 function add(x, y) {
   return {
-          re: x.re + y.re,
-          im: x.im + y.im
-        };
+    re: x.re + y.re,
+    im: x.im + y.im
+  };
 }
 
 function sub(x, y) {
   return {
-          re: x.re - y.re,
-          im: x.im - y.im
-        };
+    re: x.re - y.re,
+    im: x.im - y.im
+  };
 }
 
 function neg(x) {
   return {
-          re: - x.re,
-          im: - x.im
-        };
+    re: - x.re,
+    im: - x.im
+  };
 }
 
 function conj(x) {
   return {
-          re: x.re,
-          im: - x.im
-        };
+    re: x.re,
+    im: - x.im
+  };
 }
 
 function mul(x, y) {
   return {
-          re: x.re * y.re - x.im * y.im,
-          im: x.re * y.im + x.im * y.re
-        };
+    re: x.re * y.re - x.im * y.im,
+    im: x.re * y.im + x.im * y.re
+  };
 }
 
 function div(x, y) {
@@ -46,16 +46,16 @@ function div(x, y) {
     var r = y.im / y.re;
     var d = y.re + r * y.im;
     return {
-            re: (x.re + r * x.im) / d,
-            im: (x.im - r * x.re) / d
-          };
+      re: (x.re + r * x.im) / d,
+      im: (x.im - r * x.re) / d
+    };
   }
   var r$1 = y.re / y.im;
   var d$1 = y.im + r$1 * y.re;
   return {
-          re: (r$1 * x.re + x.im) / d$1,
-          im: (r$1 * x.im - x.re) / d$1
-        };
+    re: (r$1 * x.re + x.im) / d$1,
+    im: (r$1 * x.im - x.re) / d$1
+  };
 }
 
 function inv(x) {
@@ -89,17 +89,17 @@ function arg(x) {
 
 function polar(n, a) {
   return {
-          re: Math.cos(a) * n,
-          im: Math.sin(a) * n
-        };
+    re: Math.cos(a) * n,
+    im: Math.sin(a) * n
+  };
 }
 
 function sqrt(x) {
   if (x.re === 0.0 && x.im === 0.0) {
     return {
-            re: 0.0,
-            im: 0.0
-          };
+      re: 0.0,
+      im: 0.0
+    };
   }
   var r = Math.abs(x.re);
   var i = Math.abs(x.im);
@@ -113,30 +113,30 @@ function sqrt(x) {
   }
   if (x.re >= 0.0) {
     return {
-            re: w,
-            im: 0.5 * x.im / w
-          };
+      re: w,
+      im: 0.5 * x.im / w
+    };
   } else {
     return {
-            re: 0.5 * i / w,
-            im: x.im >= 0.0 ? w : - w
-          };
+      re: 0.5 * i / w,
+      im: x.im >= 0.0 ? w : - w
+    };
   }
 }
 
 function exp(x) {
   var e = Math.exp(x.re);
   return {
-          re: e * Math.cos(x.im),
-          im: e * Math.sin(x.im)
-        };
+    re: e * Math.cos(x.im),
+    im: e * Math.sin(x.im)
+  };
 }
 
 function log(x) {
   return {
-          re: Math.log(norm(x)),
-          im: Math.atan2(x.im, x.re)
-        };
+    re: Math.log(norm(x)),
+    im: Math.atan2(x.im, x.re)
+  };
 }
 
 function pow(x, y) {
diff --git a/lib/es6/curry.js b/lib/es6/curry.js
index 76b42ef5bc8..426fd466c4a 100644
--- a/lib/es6/curry.js
+++ b/lib/es6/curry.js
@@ -107,9 +107,9 @@ function _2(o, a0, a1) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1
-                  ]);
+              a0,
+              a1
+            ]);
     }
   }
 }
@@ -133,9 +133,9 @@ function _3(o, a0, a1, a2) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2
-                    ]);
+                a1,
+                a2
+              ]);
       case 2 :
           return app(o(a0, a1), [a2]);
       case 3 :
@@ -158,10 +158,10 @@ function _3(o, a0, a1, a2) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2
-                  ]);
+              a0,
+              a1,
+              a2
+            ]);
     }
   }
 }
@@ -185,15 +185,15 @@ function _4(o, a0, a1, a2, a3) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3
-                    ]);
+                a1,
+                a2,
+                a3
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3
-                    ]);
+                a2,
+                a3
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [a3]);
       case 4 :
@@ -212,11 +212,11 @@ function _4(o, a0, a1, a2, a3) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3
+            ]);
     }
   }
 }
@@ -240,22 +240,22 @@ function _5(o, a0, a1, a2, a3, a4) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4
-                    ]);
+                a2,
+                a3,
+                a4
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4
-                    ]);
+                a3,
+                a4
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [a4]);
       case 5 :
@@ -270,12 +270,12 @@ function _5(o, a0, a1, a2, a3, a4) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4
+            ]);
     }
   }
 }
@@ -299,30 +299,30 @@ function _6(o, a0, a1, a2, a3, a4, a5) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a3,
+                a4,
+                a5
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5
-                    ]);
+                a4,
+                a5
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [a5]);
       case 6 :
@@ -333,13 +333,13 @@ function _6(o, a0, a1, a2, a3, a4, a5) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5
+            ]);
     }
   }
 }
@@ -363,53 +363,53 @@ function _7(o, a0, a1, a2, a3, a4, a5, a6) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a4,
+                a5,
+                a6
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [
-                      a5,
-                      a6
-                    ]);
+                a5,
+                a6
+              ]);
       case 6 :
           return app(o(a0, a1, a2, a3, a4, a5), [a6]);
       case 7 :
           return o(a0, a1, a2, a3, a4, a5, a6);
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5,
-                    a6
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5,
+              a6
+            ]);
     }
   }
 }
@@ -433,62 +433,62 @@ function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a5,
+                a6,
+                a7
+              ]);
       case 6 :
           return app(o(a0, a1, a2, a3, a4, a5), [
-                      a6,
-                      a7
-                    ]);
+                a6,
+                a7
+              ]);
       case 7 :
           return app(o(a0, a1, a2, a3, a4, a5, a6), [a7]);
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5,
-                    a6,
-                    a7
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5,
+              a6,
+              a7
+            ]);
     }
   }
 }
diff --git a/lib/es6/digest.js b/lib/es6/digest.js
index 0b13a29f9d5..5725fba214b 100644
--- a/lib/es6/digest.js
+++ b/lib/es6/digest.js
@@ -18,10 +18,10 @@ function bytes(b) {
 function substring(str, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (str.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.substring",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.substring",
+      Error: new Error()
+    };
   }
   return Caml_md5.md5_string(str, ofs, len);
 }
@@ -32,17 +32,17 @@ function subbytes(b, ofs, len) {
 
 function char_hex(n) {
   return n + (
-          n < 10 ? /* '0' */48 : 87
-        ) | 0;
+    n < 10 ? /* '0' */48 : 87
+  ) | 0;
 }
 
 function to_hex(d) {
   if (d.length !== 16) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.to_hex",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.to_hex",
+      Error: new Error()
+    };
   }
   var result = Caml_bytes.create(32);
   for(var i = 0; i <= 15; ++i){
@@ -56,38 +56,38 @@ function to_hex(d) {
 function from_hex(s) {
   if (s.length !== 32) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.from_hex",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.from_hex",
+      Error: new Error()
+    };
   }
   var digit = function (c) {
     if (c >= 65) {
       if (c >= 97) {
         if (c >= 103) {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Digest.from_hex",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Digest.from_hex",
+            Error: new Error()
+          };
         }
         return (c - /* 'a' */97 | 0) + 10 | 0;
       }
       if (c >= 71) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Digest.from_hex",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Digest.from_hex",
+          Error: new Error()
+        };
       }
       return (c - /* 'A' */65 | 0) + 10 | 0;
     }
     if (c > 57 || c < 48) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Digest.from_hex",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Digest.from_hex",
+        Error: new Error()
+      };
     }
     return c - /* '0' */48 | 0;
   };
diff --git a/lib/es6/filename.js b/lib/es6/filename.js
index 169a10ae27b..2b0112eef8d 100644
--- a/lib/es6/filename.js
+++ b/lib/es6/filename.js
@@ -282,14 +282,14 @@ function has_drive(s) {
 function drive_and_path(s) {
   if (has_drive(s)) {
     return [
-            $$String.sub(s, 0, 2),
-            $$String.sub(s, 2, s.length - 2 | 0)
-          ];
+      $$String.sub(s, 0, 2),
+      $$String.sub(s, 2, s.length - 2 | 0)
+    ];
   } else {
     return [
-            "",
-            s
-          ];
+      "",
+      s
+    ];
   }
 }
 
@@ -382,10 +382,10 @@ function chop_suffix(name, suff) {
   var n = name.length - suff.length | 0;
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Filename.chop_suffix",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Filename.chop_suffix",
+      Error: new Error()
+    };
   }
   return $$String.sub(name, 0, n);
 }
@@ -429,10 +429,10 @@ function chop_extension(name) {
   var l = extension_len(name);
   if (l === 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Filename.chop_extension",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Filename.chop_extension",
+      Error: new Error()
+    };
   }
   return $$String.sub(name, 0, name.length - l | 0);
 }
diff --git a/lib/es6/genlex.js b/lib/es6/genlex.js
index c74735e6413..8d5669107fc 100644
--- a/lib/es6/genlex.js
+++ b/lib/es6/genlex.js
@@ -57,9 +57,9 @@ function make_lexer(keywords) {
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.RE_EXN_ID === "Not_found") {
         return {
-                TAG: "Ident",
-                _0: id
-              };
+          TAG: "Ident",
+          _0: id
+        };
       }
       throw exn;
     }
@@ -73,10 +73,10 @@ function make_lexer(keywords) {
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.RE_EXN_ID === "Not_found") {
         throw {
-              RE_EXN_ID: Stream.$$Error,
-              _1: "Illegal character " + s,
-              Error: new Error()
-            };
+          RE_EXN_ID: Stream.$$Error,
+          _1: "Illegal character " + s,
+          Error: new Error()
+        };
       }
       throw exn;
     }
@@ -106,9 +106,9 @@ function make_lexer(keywords) {
                   Stream.junk(strm__);
                   reset_buffer();
                   return {
-                          TAG: "String",
-                          _0: string(strm__)
-                        };
+                    TAG: "String",
+                    _0: string(strm__)
+                  };
               case 39 :
                   Stream.junk(strm__);
                   var c$1;
@@ -119,10 +119,10 @@ function make_lexer(keywords) {
                     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                     if (exn.RE_EXN_ID === Stream.Failure) {
                       throw {
-                            RE_EXN_ID: Stream.$$Error,
-                            _1: "",
-                            Error: new Error()
-                          };
+                        RE_EXN_ID: Stream.$$Error,
+                        _1: "",
+                        Error: new Error()
+                      };
                     }
                     throw exn;
                   }
@@ -130,22 +130,22 @@ function make_lexer(keywords) {
                   if (match !== undefined) {
                     if (match !== 39) {
                       throw {
-                            RE_EXN_ID: Stream.$$Error,
-                            _1: "",
-                            Error: new Error()
-                          };
+                        RE_EXN_ID: Stream.$$Error,
+                        _1: "",
+                        Error: new Error()
+                      };
                     }
                     Stream.junk(strm__);
                     return {
-                            TAG: "Char",
-                            _0: c$1
-                          };
+                      TAG: "Char",
+                      _0: c$1
+                    };
                   }
                   throw {
-                        RE_EXN_ID: Stream.$$Error,
-                        _1: "",
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stream.$$Error,
+                    _1: "",
+                    Error: new Error()
+                  };
               case 40 :
                   Stream.junk(strm__);
                   var match$1 = Stream.peek(strm__);
@@ -412,16 +412,16 @@ function make_lexer(keywords) {
               
             }
             return {
-                    TAG: "Float",
-                    _0: Caml_format.float_of_string(get_string())
-                  };
+              TAG: "Float",
+              _0: Caml_format.float_of_string(get_string())
+            };
           };
         }
       }
       return {
-              TAG: "Int",
-              _0: Caml_format.int_of_string(get_string())
-            };
+        TAG: "Int",
+        _0: Caml_format.int_of_string(get_string())
+      };
     };
   };
   var exponent_part = function (strm__) {
@@ -439,15 +439,15 @@ function make_lexer(keywords) {
       var c = Stream.peek(strm__);
       if (c === undefined) {
         return {
-                TAG: "Float",
-                _0: Caml_format.float_of_string(get_string())
-              };
+          TAG: "Float",
+          _0: Caml_format.float_of_string(get_string())
+        };
       }
       if (c > 57 || c < 48) {
         return {
-                TAG: "Float",
-                _0: Caml_format.float_of_string(get_string())
-              };
+          TAG: "Float",
+          _0: Caml_format.float_of_string(get_string())
+        };
       }
       Stream.junk(strm__);
       store(c);
@@ -473,10 +473,10 @@ function make_lexer(keywords) {
             var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.RE_EXN_ID === Stream.Failure) {
               throw {
-                    RE_EXN_ID: Stream.$$Error,
-                    _1: "",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.$$Error,
+                _1: "",
+                Error: new Error()
+              };
             }
             throw exn;
           }
@@ -487,9 +487,9 @@ function make_lexer(keywords) {
         return get_string();
       }
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     };
   };
   var $$char = function (strm__) {
@@ -507,18 +507,18 @@ function make_lexer(keywords) {
         var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.RE_EXN_ID === Stream.Failure) {
           throw {
-                RE_EXN_ID: Stream.$$Error,
-                _1: "",
-                Error: new Error()
-              };
+            RE_EXN_ID: Stream.$$Error,
+            _1: "",
+            Error: new Error()
+          };
         }
         throw exn;
       }
     } else {
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     }
   };
   var $$escape = function (strm__) {
@@ -546,44 +546,44 @@ function make_lexer(keywords) {
           if (c2 !== undefined) {
             if (c2 > 57 || c2 < 48) {
               throw {
-                    RE_EXN_ID: Stream.$$Error,
-                    _1: "",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.$$Error,
+                _1: "",
+                Error: new Error()
+              };
             }
             Stream.junk(strm__);
             var c3 = Stream.peek(strm__);
             if (c3 !== undefined) {
               if (c3 > 57 || c3 < 48) {
                 throw {
-                      RE_EXN_ID: Stream.$$Error,
-                      _1: "",
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stream.$$Error,
+                  _1: "",
+                  Error: new Error()
+                };
               }
               Stream.junk(strm__);
               return Char.chr((Math.imul(c1 - 48 | 0, 100) + Math.imul(c2 - 48 | 0, 10) | 0) + (c3 - 48 | 0) | 0);
             }
             throw {
-                  RE_EXN_ID: Stream.$$Error,
-                  _1: "",
-                  Error: new Error()
-                };
+              RE_EXN_ID: Stream.$$Error,
+              _1: "",
+              Error: new Error()
+            };
           }
           throw {
-                RE_EXN_ID: Stream.$$Error,
-                _1: "",
-                Error: new Error()
-              };
+            RE_EXN_ID: Stream.$$Error,
+            _1: "",
+            Error: new Error()
+          };
         }
         Stream.junk(strm__);
         return c1;
       }
     } else {
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     }
   };
   var comment = function (strm__) {
@@ -605,9 +605,9 @@ function make_lexer(keywords) {
                 }
               }
               throw {
-                    RE_EXN_ID: Stream.Failure,
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.Failure,
+                Error: new Error()
+              };
           case 42 :
               Stream.junk(strm__);
               while(true) {
@@ -625,9 +625,9 @@ function make_lexer(keywords) {
                   return;
                 }
                 throw {
-                      RE_EXN_ID: Stream.Failure,
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stream.Failure,
+                  Error: new Error()
+                };
               };
           default:
             Stream.junk(strm__);
@@ -635,16 +635,16 @@ function make_lexer(keywords) {
         }
       } else {
         throw {
-              RE_EXN_ID: Stream.Failure,
-              Error: new Error()
-            };
+          RE_EXN_ID: Stream.Failure,
+          Error: new Error()
+        };
       }
     };
   };
   return function (input) {
     return Stream.from(function (_count) {
-                return next_token(input);
-              });
+          return next_token(input);
+        });
   };
 }
 
diff --git a/lib/es6/hashtbl.js b/lib/es6/hashtbl.js
index 504173182f3..e77c838bbad 100644
--- a/lib/es6/hashtbl.js
+++ b/lib/es6/hashtbl.js
@@ -62,11 +62,11 @@ function create(randomOpt, initial_size) {
   var s = power_2_above(16, initial_size);
   var seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0;
   return {
-          size: 0,
-          data: Caml_array.make(s, "Empty"),
-          seed: seed,
-          initial_size: s
-        };
+    size: 0,
+    data: Caml_array.make(s, "Empty"),
+    seed: seed,
+    initial_size: s
+  };
 }
 
 function clear(h) {
@@ -113,14 +113,14 @@ function copy_bucketlist(param) {
       };
       if (typeof prec !== "object") {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "hashtbl.res",
-                110,
-                19
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "hashtbl.res",
+            110,
+            19
+          ],
+          Error: new Error()
+        };
       }
       prec.next = r;
       _param = next;
@@ -140,11 +140,11 @@ function copy_bucketlist(param) {
 
 function copy(h) {
   return {
-          size: h.size,
-          data: $$Array.map(copy_bucketlist, h.data),
-          seed: h.seed,
-          initial_size: h.initial_size
-        };
+    size: h.size,
+    data: $$Array.map(copy_bucketlist, h.data),
+    seed: h.seed,
+    initial_size: h.initial_size
+  };
 }
 
 function length(h) {
@@ -172,11 +172,11 @@ function resize(indexfun, h) {
       var data = param.data;
       var next = param.next;
       var cell = inplace ? param : ({
-            TAG: "Cons",
-            key: key,
-            data: data,
-            next: "Empty"
-          });
+          TAG: "Cons",
+          key: key,
+          data: data,
+          next: "Empty"
+        });
       var nidx = Curry._2(indexfun, h, key);
       var tail = Caml_array.get(ndata_tail, nidx);
       if (typeof tail !== "object") {
@@ -255,9 +255,9 @@ function find(h, key) {
   var match = Caml_array.get(h.data, key_index(h, key));
   if (typeof match !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k1 = match.key;
   var d1 = match.data;
@@ -267,9 +267,9 @@ function find(h, key) {
   }
   if (typeof next1 !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k2 = next1.key;
   var d2 = next1.data;
@@ -279,9 +279,9 @@ function find(h, key) {
   }
   if (typeof next2 !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k3 = next2.key;
   var d3 = next2.data;
@@ -294,9 +294,9 @@ function find(h, key) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var k = param.key;
       var data = param.data;
@@ -369,9 +369,9 @@ function find_all(h, key) {
       var next = param.next;
       if (Caml_obj.equal(k, key)) {
         return {
-                hd: data,
-                tl: find_in_bucket(next)
-              };
+          hd: data,
+          tl: find_in_bucket(next)
+        };
       }
       _param = next;
       continue ;
@@ -592,11 +592,11 @@ function stats(h) {
           Caml_array.set(histo, l, Caml_array.get(histo, l) + 1 | 0);
         }), h.data);
   return {
-          num_bindings: h.size,
-          num_buckets: h.data.length,
-          max_bucket_length: mbl,
-          bucket_histogram: histo
-        };
+    num_bindings: h.size,
+    num_buckets: h.data.length,
+    max_bucket_length: mbl,
+    bucket_histogram: histo
+  };
 }
 
 function MakeSeeded(H) {
@@ -648,9 +648,9 @@ function MakeSeeded(H) {
     var match = Caml_array.get(h.data, key_index(h, key));
     if (typeof match !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k1 = match.key;
     var d1 = match.data;
@@ -660,9 +660,9 @@ function MakeSeeded(H) {
     }
     if (typeof next1 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k2 = next1.key;
     var d2 = next1.data;
@@ -672,9 +672,9 @@ function MakeSeeded(H) {
     }
     if (typeof next2 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k3 = next2.key;
     var d3 = next2.data;
@@ -687,9 +687,9 @@ function MakeSeeded(H) {
         var param = _param;
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Not_found",
+            Error: new Error()
+          };
         }
         var k = param.key;
         var data = param.data;
@@ -760,9 +760,9 @@ function MakeSeeded(H) {
         var next = param.next;
         if (Curry._2(H.equal, k, key)) {
           return {
-                  hd: d,
-                  tl: find_in_bucket(next)
-                };
+            hd: d,
+            tl: find_in_bucket(next)
+          };
         }
         _param = next;
         continue ;
@@ -823,23 +823,23 @@ function MakeSeeded(H) {
     };
   };
   return {
-          create: create,
-          clear: clear,
-          reset: reset,
-          copy: copy,
-          add: add,
-          remove: remove,
-          find: find,
-          find_opt: find_opt,
-          find_all: find_all,
-          replace: replace,
-          mem: mem,
-          iter: iter,
-          filter_map_inplace: filter_map_inplace,
-          fold: fold,
-          length: length,
-          stats: stats
-        };
+    create: create,
+    clear: clear,
+    reset: reset,
+    copy: copy,
+    add: add,
+    remove: remove,
+    find: find,
+    find_opt: find_opt,
+    find_all: find_all,
+    replace: replace,
+    mem: mem,
+    iter: iter,
+    filter_map_inplace: filter_map_inplace,
+    fold: fold,
+    length: length,
+    stats: stats
+  };
 }
 
 function Make(H) {
@@ -892,9 +892,9 @@ function Make(H) {
     var match = Caml_array.get(h.data, key_index(h, key));
     if (typeof match !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k1 = match.key;
     var d1 = match.data;
@@ -904,9 +904,9 @@ function Make(H) {
     }
     if (typeof next1 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k2 = next1.key;
     var d2 = next1.data;
@@ -916,9 +916,9 @@ function Make(H) {
     }
     if (typeof next2 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k3 = next2.key;
     var d3 = next2.data;
@@ -931,9 +931,9 @@ function Make(H) {
         var param = _param;
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Not_found",
+            Error: new Error()
+          };
         }
         var k = param.key;
         var data = param.data;
@@ -1004,9 +1004,9 @@ function Make(H) {
         var next = param.next;
         if (Curry._2(equal, k, key)) {
           return {
-                  hd: d,
-                  tl: find_in_bucket(next)
-                };
+            hd: d,
+            tl: find_in_bucket(next)
+          };
         }
         _param = next;
         continue ;
@@ -1070,23 +1070,23 @@ function Make(H) {
     return create(false, sz);
   };
   return {
-          create: create$1,
-          clear: clear,
-          reset: reset,
-          copy: copy,
-          add: add,
-          remove: remove,
-          find: find,
-          find_opt: find_opt,
-          find_all: find_all,
-          replace: replace,
-          mem: mem,
-          iter: iter,
-          filter_map_inplace: filter_map_inplace,
-          fold: fold,
-          length: length,
-          stats: stats
-        };
+    create: create$1,
+    clear: clear,
+    reset: reset,
+    copy: copy,
+    add: add,
+    remove: remove,
+    find: find,
+    find_opt: find_opt,
+    find_all: find_all,
+    replace: replace,
+    mem: mem,
+    iter: iter,
+    filter_map_inplace: filter_map_inplace,
+    fold: fold,
+    length: length,
+    stats: stats
+  };
 }
 
 var seeded_hash_param = Caml_hash.hash;
diff --git a/lib/es6/hashtblLabels.js b/lib/es6/hashtblLabels.js
index be72976b4a9..90839873602 100644
--- a/lib/es6/hashtblLabels.js
+++ b/lib/es6/hashtblLabels.js
@@ -38,23 +38,23 @@ function MakeSeeded(H) {
     return Curry._3(fold, Curry.__3(f), tbl, init);
   };
   return {
-          create: include.create,
-          clear: include.clear,
-          reset: include.reset,
-          copy: include.copy,
-          add: add$1,
-          remove: include.remove,
-          find: include.find,
-          find_opt: include.find_opt,
-          find_all: include.find_all,
-          replace: replace$1,
-          mem: include.mem,
-          iter: iter$1,
-          filter_map_inplace: filter_map_inplace$1,
-          fold: fold$1,
-          length: include.length,
-          stats: include.stats
-        };
+    create: include.create,
+    clear: include.clear,
+    reset: include.reset,
+    copy: include.copy,
+    add: add$1,
+    remove: include.remove,
+    find: include.find,
+    find_opt: include.find_opt,
+    find_all: include.find_all,
+    replace: replace$1,
+    mem: include.mem,
+    iter: iter$1,
+    filter_map_inplace: filter_map_inplace$1,
+    fold: fold$1,
+    length: include.length,
+    stats: include.stats
+  };
 }
 
 function Make(H) {
@@ -88,23 +88,23 @@ function Make(H) {
     return Curry._2(create, false, sz);
   };
   return {
-          create: create$1,
-          clear: include.clear,
-          reset: include.reset,
-          copy: include.copy,
-          add: add$1,
-          remove: include.remove,
-          find: include.find,
-          find_opt: include.find_opt,
-          find_all: include.find_all,
-          replace: replace$1,
-          mem: include.mem,
-          iter: iter$1,
-          filter_map_inplace: filter_map_inplace$1,
-          fold: fold$1,
-          length: include.length,
-          stats: include.stats
-        };
+    create: create$1,
+    clear: include.clear,
+    reset: include.reset,
+    copy: include.copy,
+    add: add$1,
+    remove: include.remove,
+    find: include.find,
+    find_opt: include.find_opt,
+    find_all: include.find_all,
+    replace: replace$1,
+    mem: include.mem,
+    iter: iter$1,
+    filter_map_inplace: filter_map_inplace$1,
+    fold: fold$1,
+    length: include.length,
+    stats: include.stats
+  };
 }
 
 var create = Hashtbl.create;
diff --git a/lib/es6/js_array.js b/lib/es6/js_array.js
index cb4f8f8f67c..681986ffa47 100644
--- a/lib/es6/js_array.js
+++ b/lib/es6/js_array.js
@@ -42,10 +42,10 @@ function sortInPlaceWith(arg1, obj) {
 
 function spliceInPlace(pos, remove, add, obj) {
   return Caml_splice_call.spliceObjApply(obj, "splice", [
-              pos,
-              remove,
-              add
-            ]);
+        pos,
+        remove,
+        add
+      ]);
 }
 
 function removeFromInPlace(pos, obj) {
diff --git a/lib/es6/js_json.js b/lib/es6/js_json.js
index 4993eb6b149..2f5069ca4b1 100644
--- a/lib/es6/js_json.js
+++ b/lib/es6/js_json.js
@@ -7,14 +7,14 @@ function classify(x) {
   var ty = typeof x;
   if (ty === "string") {
     return {
-            TAG: "JSONString",
-            _0: x
-          };
+      TAG: "JSONString",
+      _0: x
+    };
   } else if (ty === "number") {
     return {
-            TAG: "JSONNumber",
-            _0: x
-          };
+      TAG: "JSONNumber",
+      _0: x
+    };
   } else if (ty === "boolean") {
     if (x === true) {
       return "JSONTrue";
@@ -25,14 +25,14 @@ function classify(x) {
     return "JSONNull";
   } else if (Array.isArray(x)) {
     return {
-            TAG: "JSONArray",
-            _0: x
-          };
+      TAG: "JSONArray",
+      _0: x
+    };
   } else {
     return {
-            TAG: "JSONObject",
-            _0: x
-          };
+      TAG: "JSONObject",
+      _0: x
+    };
   }
 }
 
diff --git a/lib/es6/js_list.js b/lib/es6/js_list.js
index a312106fc9b..f4802ce0a35 100644
--- a/lib/es6/js_list.js
+++ b/lib/es6/js_list.js
@@ -20,9 +20,9 @@ function length(l) {
 
 function cons(x, xs) {
   return {
-          hd: x,
-          tl: xs
-        };
+    hd: x,
+    tl: xs
+  };
 }
 
 function isEmpty(x) {
diff --git a/lib/es6/js_mapperRt.js b/lib/es6/js_mapperRt.js
index 5f95a14bc99..56ea2cfbf0c 100644
--- a/lib/es6/js_mapperRt.js
+++ b/lib/es6/js_mapperRt.js
@@ -4,9 +4,9 @@
 function raiseWhenNotFound(x) {
   if (x == null) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   return x;
 }
@@ -33,9 +33,9 @@ function fromIntAssert(len, xs, $$enum) {
     var i = _i;
     if (i === len) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k = xs[i];
     if (k === $$enum) {
diff --git a/lib/es6/js_types.js b/lib/es6/js_types.js
index 4f103cd5743..f1ac629d03e 100644
--- a/lib/es6/js_types.js
+++ b/lib/es6/js_types.js
@@ -9,19 +9,19 @@ function classify(x) {
     return "JSNull";
   } else if (ty === "number") {
     return {
-            TAG: "JSNumber",
-            _0: x
-          };
+      TAG: "JSNumber",
+      _0: x
+    };
   } else if (ty === "bigint") {
     return {
-            TAG: "JSBigInt",
-            _0: x
-          };
+      TAG: "JSBigInt",
+      _0: x
+    };
   } else if (ty === "string") {
     return {
-            TAG: "JSString",
-            _0: x
-          };
+      TAG: "JSString",
+      _0: x
+    };
   } else if (ty === "boolean") {
     if (x === true) {
       return "JSTrue";
@@ -30,19 +30,19 @@ function classify(x) {
     }
   } else if (ty === "symbol") {
     return {
-            TAG: "JSSymbol",
-            _0: x
-          };
+      TAG: "JSSymbol",
+      _0: x
+    };
   } else if (ty === "function") {
     return {
-            TAG: "JSFunction",
-            _0: x
-          };
+      TAG: "JSFunction",
+      _0: x
+    };
   } else {
     return {
-            TAG: "JSObject",
-            _0: x
-          };
+      TAG: "JSObject",
+      _0: x
+    };
   }
 }
 
diff --git a/lib/es6/jsxPPXReactSupportC.js b/lib/es6/jsxPPXReactSupportC.js
index 36a31641a06..db1a5c60306 100644
--- a/lib/es6/jsxPPXReactSupportC.js
+++ b/lib/es6/jsxPPXReactSupportC.js
@@ -5,18 +5,18 @@ import * as Caml_splice_call from "./caml_splice_call.js";
 
 function createElementWithKey(key, component, props) {
   return React.createElement(component, key !== undefined ? Object.assign({
-                    key: key
-                  }, props) : props);
+              key: key
+            }, props) : props);
 }
 
 function createElementVariadicWithKey(key, component, props, elements) {
   return Caml_splice_call.spliceApply(React.createElement, [
-              component,
-              key !== undefined ? Object.assign({
-                      key: key
-                    }, props) : props,
-              elements
-            ]);
+        component,
+        key !== undefined ? Object.assign({
+                key: key
+              }, props) : props,
+        elements
+      ]);
 }
 
 var Jsx;
diff --git a/lib/es6/jsxPPXReactSupportU.js b/lib/es6/jsxPPXReactSupportU.js
index 36a31641a06..db1a5c60306 100644
--- a/lib/es6/jsxPPXReactSupportU.js
+++ b/lib/es6/jsxPPXReactSupportU.js
@@ -5,18 +5,18 @@ import * as Caml_splice_call from "./caml_splice_call.js";
 
 function createElementWithKey(key, component, props) {
   return React.createElement(component, key !== undefined ? Object.assign({
-                    key: key
-                  }, props) : props);
+              key: key
+            }, props) : props);
 }
 
 function createElementVariadicWithKey(key, component, props, elements) {
   return Caml_splice_call.spliceApply(React.createElement, [
-              component,
-              key !== undefined ? Object.assign({
-                      key: key
-                    }, props) : props,
-              elements
-            ]);
+        component,
+        key !== undefined ? Object.assign({
+                key: key
+              }, props) : props,
+        elements
+      ]);
 }
 
 var Jsx;
diff --git a/lib/es6/lazy.js b/lib/es6/lazy.js
index d6b8866124c..39526c59685 100644
--- a/lib/es6/lazy.js
+++ b/lib/es6/lazy.js
@@ -5,8 +5,8 @@ import * as CamlinternalLazy from "./camlinternalLazy.js";
 
 function from_fun(f) {
   return CamlinternalLazy.from_fun(function () {
-              return Curry._1(f, undefined);
-            });
+        return Curry._1(f, undefined);
+      });
 }
 
 var from_val = CamlinternalLazy.from_val;
diff --git a/lib/es6/lexing.js b/lib/es6/lexing.js
index b7726205d40..56c4f12da29 100644
--- a/lib/es6/lexing.js
+++ b/lib/es6/lexing.js
@@ -46,74 +46,74 @@ var zero_pos = {
 function from_function(f) {
   var partial_arg = Caml_bytes.create(512);
   return {
-          refill_buff: (function (param) {
-              var read = Curry._2(f, partial_arg, partial_arg.length);
-              var n = read > 0 ? read : (param.lex_eof_reached = true, 0);
-              if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) {
-                if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) {
-                  Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0);
-                } else {
-                  var newlen = (param.lex_buffer.length << 1);
-                  if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) {
-                    throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Lexing.lex_refill: cannot grow buffer",
-                          Error: new Error()
-                        };
-                  }
-                  var newbuf = Caml_bytes.create(newlen);
-                  Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0);
-                  param.lex_buffer = newbuf;
-                }
-                var s = param.lex_start_pos;
-                param.lex_abs_pos = param.lex_abs_pos + s | 0;
-                param.lex_curr_pos = param.lex_curr_pos - s | 0;
-                param.lex_start_pos = 0;
-                param.lex_last_pos = param.lex_last_pos - s | 0;
-                param.lex_buffer_len = param.lex_buffer_len - s | 0;
-                var t = param.lex_mem;
-                for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){
-                  var v = Caml_array.get(t, i);
-                  if (v >= 0) {
-                    Caml_array.set(t, i, v - s | 0);
-                  }
-                  
-                }
-              }
-              Bytes.blit(partial_arg, 0, param.lex_buffer, param.lex_buffer_len, n);
-              param.lex_buffer_len = param.lex_buffer_len + n | 0;
-            }),
-          lex_buffer: Caml_bytes.create(1024),
-          lex_buffer_len: 0,
-          lex_abs_pos: 0,
-          lex_start_pos: 0,
-          lex_curr_pos: 0,
-          lex_last_pos: 0,
-          lex_last_action: 0,
-          lex_eof_reached: false,
-          lex_mem: [],
-          lex_start_p: zero_pos,
-          lex_curr_p: zero_pos
-        };
+    refill_buff: (function (param) {
+        var read = Curry._2(f, partial_arg, partial_arg.length);
+        var n = read > 0 ? read : (param.lex_eof_reached = true, 0);
+        if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) {
+          if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) {
+            Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0);
+          } else {
+            var newlen = (param.lex_buffer.length << 1);
+            if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) {
+              throw {
+                RE_EXN_ID: "Failure",
+                _1: "Lexing.lex_refill: cannot grow buffer",
+                Error: new Error()
+              };
+            }
+            var newbuf = Caml_bytes.create(newlen);
+            Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0);
+            param.lex_buffer = newbuf;
+          }
+          var s = param.lex_start_pos;
+          param.lex_abs_pos = param.lex_abs_pos + s | 0;
+          param.lex_curr_pos = param.lex_curr_pos - s | 0;
+          param.lex_start_pos = 0;
+          param.lex_last_pos = param.lex_last_pos - s | 0;
+          param.lex_buffer_len = param.lex_buffer_len - s | 0;
+          var t = param.lex_mem;
+          for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){
+            var v = Caml_array.get(t, i);
+            if (v >= 0) {
+              Caml_array.set(t, i, v - s | 0);
+            }
+            
+          }
+        }
+        Bytes.blit(partial_arg, 0, param.lex_buffer, param.lex_buffer_len, n);
+        param.lex_buffer_len = param.lex_buffer_len + n | 0;
+      }),
+    lex_buffer: Caml_bytes.create(1024),
+    lex_buffer_len: 0,
+    lex_abs_pos: 0,
+    lex_start_pos: 0,
+    lex_curr_pos: 0,
+    lex_last_pos: 0,
+    lex_last_action: 0,
+    lex_eof_reached: false,
+    lex_mem: [],
+    lex_start_p: zero_pos,
+    lex_curr_p: zero_pos
+  };
 }
 
 function from_string(s) {
   return {
-          refill_buff: (function (lexbuf) {
-              lexbuf.lex_eof_reached = true;
-            }),
-          lex_buffer: Bytes.of_string(s),
-          lex_buffer_len: s.length,
-          lex_abs_pos: 0,
-          lex_start_pos: 0,
-          lex_curr_pos: 0,
-          lex_last_pos: 0,
-          lex_last_action: 0,
-          lex_eof_reached: true,
-          lex_mem: [],
-          lex_start_p: zero_pos,
-          lex_curr_p: zero_pos
-        };
+    refill_buff: (function (lexbuf) {
+        lexbuf.lex_eof_reached = true;
+      }),
+    lex_buffer: Bytes.of_string(s),
+    lex_buffer_len: s.length,
+    lex_abs_pos: 0,
+    lex_start_pos: 0,
+    lex_curr_pos: 0,
+    lex_last_pos: 0,
+    lex_last_action: 0,
+    lex_eof_reached: true,
+    lex_mem: [],
+    lex_start_p: zero_pos,
+    lex_curr_p: zero_pos
+  };
 }
 
 function lexeme(lexbuf) {
diff --git a/lib/es6/list.js b/lib/es6/list.js
index 2bd31b8ed86..61eb8e59fde 100644
--- a/lib/es6/list.js
+++ b/lib/es6/list.js
@@ -22,9 +22,9 @@ function length(l) {
 
 function cons(a, l) {
   return {
-          hd: a,
-          tl: l
-        };
+    hd: a,
+    tl: l
+  };
 }
 
 function hd(param) {
@@ -32,10 +32,10 @@ function hd(param) {
     return param.hd;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "hd",
+    Error: new Error()
+  };
 }
 
 function tl(param) {
@@ -43,19 +43,19 @@ function tl(param) {
     return param.tl;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "tl",
+    Error: new Error()
+  };
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -71,20 +71,20 @@ function nth(l, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "nth",
+      Error: new Error()
+    };
   };
 }
 
 function nth_opt(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -145,18 +145,18 @@ function init_aux(i, n, f) {
   }
   var r = Curry._1(f, i);
   return {
-          hd: r,
-          tl: init_aux(i + 1 | 0, n, f)
-        };
+    hd: r,
+    tl: init_aux(i + 1 | 0, n, f)
+  };
 }
 
 function init(len, f) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.init",
+      Error: new Error()
+    };
   }
   if (len > 10000) {
     return rev_append(init_tailrec_aux(/* [] */0, 0, len, f), /* [] */0);
@@ -179,9 +179,9 @@ function map(f, param) {
   }
   var r = Curry._1(f, param.hd);
   return {
-          hd: r,
-          tl: map(f, param.tl)
-        };
+    hd: r,
+    tl: map(f, param.tl)
+  };
 }
 
 function mapi(i, f, param) {
@@ -190,9 +190,9 @@ function mapi(i, f, param) {
   }
   var r = Curry._2(f, i, param.hd);
   return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, param.tl)
-        };
+    hd: r,
+    tl: mapi(i + 1 | 0, f, param.tl)
+  };
 }
 
 function mapi$1(f, l) {
@@ -271,24 +271,24 @@ function map2(f, l1, l2) {
     if (l2) {
       var r = Curry._2(f, l1.hd, l2.hd);
       return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
+        hd: r,
+        tl: map2(f, l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2",
+    Error: new Error()
+  };
 }
 
 function rev_map2(f, l1, l2) {
@@ -310,17 +310,17 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     if (l2$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -338,19 +338,19 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.iter2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.iter2",
+      Error: new Error()
+    };
   };
 }
 
@@ -367,17 +367,17 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     if (l2) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -389,17 +389,17 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -446,19 +446,19 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.for_all2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return true;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.for_all2",
+      Error: new Error()
+    };
   };
 }
 
@@ -476,19 +476,19 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.exists2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return false;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.exists2",
+      Error: new Error()
+    };
   };
 }
 
@@ -532,9 +532,9 @@ function assoc(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -565,9 +565,9 @@ function assq(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -624,9 +624,9 @@ function remove_assoc(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -640,9 +640,9 @@ function remove_assq(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -658,9 +658,9 @@ function find(p, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -715,9 +715,9 @@ function partition(p, l) {
     var yes = _yes;
     if (!param) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     var l$1 = param.tl;
     var x = param.hd;
@@ -741,49 +741,49 @@ function partition(p, l) {
 function split(param) {
   if (!param) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = param.hd;
   var match$1 = split(param.tl);
   return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
+    {
+      hd: match[0],
+      tl: match$1[0]
+    },
+    {
+      hd: match[1],
+      tl: match$1[1]
+    }
+  ];
 }
 
 function combine(l1, l2) {
   if (l1) {
     if (l2) {
       return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
+        hd: [
+          l1.hd,
+          l2.hd
+        ],
+        tl: combine(l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.combine",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.combine",
+    Error: new Error()
+  };
 }
 
 function merge(cmp, l1, l2) {
@@ -797,14 +797,14 @@ function merge(cmp, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(cmp, h1, h2) <= 0) {
     return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(cmp, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(cmp, l1, l2.tl)
+    };
   }
 }
 
@@ -821,14 +821,14 @@ function chop(_k, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "list.res",
-            420,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "list.res",
+        420,
+        11
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -846,71 +846,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) <= 0) {
               if (Curry._2(cmp, x2, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -925,20 +925,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) <= 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -992,71 +992,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) > 0) {
               if (Curry._2(cmp, x2, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1071,20 +1071,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1149,136 +1149,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 < 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c < 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1294,25 +1294,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 < 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1380,136 +1380,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 > 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c > 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1525,25 +1525,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
diff --git a/lib/es6/listLabels.js b/lib/es6/listLabels.js
index 93f0c82ca28..cf799c7b6c9 100644
--- a/lib/es6/listLabels.js
+++ b/lib/es6/listLabels.js
@@ -22,9 +22,9 @@ function length(l) {
 
 function cons(a, l) {
   return {
-          hd: a,
-          tl: l
-        };
+    hd: a,
+    tl: l
+  };
 }
 
 function hd(param) {
@@ -32,10 +32,10 @@ function hd(param) {
     return param.hd;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "hd",
+    Error: new Error()
+  };
 }
 
 function tl(param) {
@@ -43,19 +43,19 @@ function tl(param) {
     return param.tl;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "tl",
+    Error: new Error()
+  };
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -71,20 +71,20 @@ function nth(l, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "nth",
+      Error: new Error()
+    };
   };
 }
 
 function nth_opt(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -145,18 +145,18 @@ function init_aux(i, n, f) {
   }
   var r = Curry._1(f, i);
   return {
-          hd: r,
-          tl: init_aux(i + 1 | 0, n, f)
-        };
+    hd: r,
+    tl: init_aux(i + 1 | 0, n, f)
+  };
 }
 
 function init(len, f) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.init",
+      Error: new Error()
+    };
   }
   if (len > 10000) {
     return rev_append(init_tailrec_aux(/* [] */0, 0, len, f), /* [] */0);
@@ -179,9 +179,9 @@ function map(f, param) {
   }
   var r = Curry._1(f, param.hd);
   return {
-          hd: r,
-          tl: map(f, param.tl)
-        };
+    hd: r,
+    tl: map(f, param.tl)
+  };
 }
 
 function mapi(i, f, param) {
@@ -190,9 +190,9 @@ function mapi(i, f, param) {
   }
   var r = Curry._2(f, i, param.hd);
   return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, param.tl)
-        };
+    hd: r,
+    tl: mapi(i + 1 | 0, f, param.tl)
+  };
 }
 
 function mapi$1(f, l) {
@@ -271,24 +271,24 @@ function map2(f, l1, l2) {
     if (l2) {
       var r = Curry._2(f, l1.hd, l2.hd);
       return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
+        hd: r,
+        tl: map2(f, l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2",
+    Error: new Error()
+  };
 }
 
 function rev_map2(f, l1, l2) {
@@ -310,17 +310,17 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     if (l2$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -338,19 +338,19 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.iter2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.iter2",
+      Error: new Error()
+    };
   };
 }
 
@@ -367,17 +367,17 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     if (l2) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -389,17 +389,17 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -446,19 +446,19 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.for_all2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return true;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.for_all2",
+      Error: new Error()
+    };
   };
 }
 
@@ -476,19 +476,19 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.exists2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return false;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.exists2",
+      Error: new Error()
+    };
   };
 }
 
@@ -532,9 +532,9 @@ function assoc(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -565,9 +565,9 @@ function assq(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -624,9 +624,9 @@ function remove_assoc(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -640,9 +640,9 @@ function remove_assq(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -658,9 +658,9 @@ function find(p, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -715,9 +715,9 @@ function partition(p, l) {
     var yes = _yes;
     if (!param) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     var l$1 = param.tl;
     var x = param.hd;
@@ -741,49 +741,49 @@ function partition(p, l) {
 function split(param) {
   if (!param) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = param.hd;
   var match$1 = split(param.tl);
   return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
+    {
+      hd: match[0],
+      tl: match$1[0]
+    },
+    {
+      hd: match[1],
+      tl: match$1[1]
+    }
+  ];
 }
 
 function combine(l1, l2) {
   if (l1) {
     if (l2) {
       return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
+        hd: [
+          l1.hd,
+          l2.hd
+        ],
+        tl: combine(l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.combine",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.combine",
+    Error: new Error()
+  };
 }
 
 function merge(cmp, l1, l2) {
@@ -797,14 +797,14 @@ function merge(cmp, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(cmp, h1, h2) <= 0) {
     return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(cmp, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(cmp, l1, l2.tl)
+    };
   }
 }
 
@@ -821,14 +821,14 @@ function chop(_k, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "listLabels.res",
-            420,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "listLabels.res",
+        420,
+        11
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -846,71 +846,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) <= 0) {
               if (Curry._2(cmp, x2, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -925,20 +925,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) <= 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -992,71 +992,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) > 0) {
               if (Curry._2(cmp, x2, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1071,20 +1071,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1149,136 +1149,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 < 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c < 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1294,25 +1294,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 < 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1380,136 +1380,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 > 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c > 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1525,25 +1525,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
diff --git a/lib/es6/map.js b/lib/es6/map.js
index 42330cccaee..4c6cc710531 100644
--- a/lib/es6/map.js
+++ b/lib/es6/map.js
@@ -15,23 +15,23 @@ function Make(funarg) {
     var hl = height(l);
     var hr = height(r);
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var singleton = function (x, d) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: d,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: d,
+      r: "Empty",
+      h: 1
+    };
   };
   var bal = function (l, x, d, r) {
     var hl;
@@ -41,10 +41,10 @@ function Make(funarg) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var ld = l.d;
@@ -57,27 +57,27 @@ function Make(funarg) {
         return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: d,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: d,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rd = r.d;
@@ -90,10 +90,10 @@ function Make(funarg) {
       return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -105,13 +105,13 @@ function Make(funarg) {
   var add = function (x, data, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: data,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: data,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var d = param.d;
@@ -123,13 +123,13 @@ function Make(funarg) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -152,9 +152,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = Curry._2(funarg.compare, x, param.v);
       if (c === 0) {
@@ -169,9 +169,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -184,9 +184,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -220,9 +220,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -244,9 +244,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -259,9 +259,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -295,9 +295,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -347,16 +347,16 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -371,9 +371,9 @@ function Make(funarg) {
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -384,16 +384,16 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -408,9 +408,9 @@ function Make(funarg) {
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -419,10 +419,10 @@ function Make(funarg) {
   var remove_min_binding = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -473,13 +473,13 @@ function Make(funarg) {
       var data = Curry._1(f, undefined);
       if (data !== undefined) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: Caml_option.valFromOption(data),
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: Caml_option.valFromOption(data),
+          r: "Empty",
+          h: 1
+        };
       } else {
         return "Empty";
       }
@@ -499,13 +499,13 @@ function Make(funarg) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data$2,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data$2,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -543,13 +543,13 @@ function Make(funarg) {
     var d$p = Curry._1(f, param.d);
     var r$p = map(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: param.v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: param.v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var mapi = function (f, param) {
     if (typeof param !== "object") {
@@ -560,13 +560,13 @@ function Make(funarg) {
     var d$p = Curry._2(f, v, param.d);
     var r$p = mapi(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var fold = function (f, _m, _accu) {
     while(true) {
@@ -663,10 +663,10 @@ function Make(funarg) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
+        "Empty",
+        undefined,
+        "Empty"
+      ];
     }
     var r = param.r;
     var d = param.d;
@@ -675,25 +675,25 @@ function Make(funarg) {
     var c = Curry._2(funarg.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
+        l,
+        Caml_option.some(d),
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, d, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, d, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var merge$1 = function (f, s1, s2) {
     if (typeof s1 !== "object") {
@@ -711,14 +711,14 @@ function Make(funarg) {
     }
     if (typeof s2 !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "map.res",
-              552,
-              11
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "map.res",
+          552,
+          11
+        ],
+        Error: new Error()
+      };
     }
     var v2 = s2.v;
     var match$1 = split(v2, s1);
@@ -780,9 +780,9 @@ function Make(funarg) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var d = param.d;
     var v = param.v;
@@ -795,14 +795,14 @@ function Make(funarg) {
     var rt = match$1[0];
     if (pvd) {
       return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, d, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, d, rf)
+      ];
     }
   };
   var cons_enum = function (_m, _e) {
@@ -908,41 +908,41 @@ function Make(funarg) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          add: add,
-          update: update,
-          singleton: singleton,
-          remove: remove,
-          merge: merge$1,
-          union: union,
-          compare: compare,
-          equal: equal,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          bindings: bindings,
-          min_binding: min_binding,
-          min_binding_opt: min_binding_opt,
-          max_binding: max_binding,
-          max_binding_opt: max_binding_opt,
-          choose: min_binding,
-          choose_opt: min_binding_opt,
-          split: split,
-          find: find,
-          find_opt: find_opt,
-          find_first: find_first,
-          find_first_opt: find_first_opt,
-          find_last: find_last,
-          find_last_opt: find_last_opt,
-          map: map,
-          mapi: mapi
-        };
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    add: add,
+    update: update,
+    singleton: singleton,
+    remove: remove,
+    merge: merge$1,
+    union: union,
+    compare: compare,
+    equal: equal,
+    iter: iter,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    bindings: bindings,
+    min_binding: min_binding,
+    min_binding_opt: min_binding_opt,
+    max_binding: max_binding,
+    max_binding_opt: max_binding_opt,
+    choose: min_binding,
+    choose_opt: min_binding_opt,
+    split: split,
+    find: find,
+    find_opt: find_opt,
+    find_first: find_first,
+    find_first_opt: find_first_opt,
+    find_last: find_last,
+    find_last_opt: find_last_opt,
+    map: map,
+    mapi: mapi
+  };
 }
 
 export {
diff --git a/lib/es6/mapLabels.js b/lib/es6/mapLabels.js
index 89f62d8d685..c9421d1cb35 100644
--- a/lib/es6/mapLabels.js
+++ b/lib/es6/mapLabels.js
@@ -15,23 +15,23 @@ function Make(Ord) {
     var hl = height(l);
     var hr = height(r);
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var singleton = function (x, d) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: d,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: d,
+      r: "Empty",
+      h: 1
+    };
   };
   var bal = function (l, x, d, r) {
     var hl;
@@ -41,10 +41,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var ld = l.d;
@@ -57,27 +57,27 @@ function Make(Ord) {
         return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: d,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: d,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rd = r.d;
@@ -90,10 +90,10 @@ function Make(Ord) {
       return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -105,13 +105,13 @@ function Make(Ord) {
   var add = function (x, data, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: data,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: data,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var d = param.d;
@@ -123,13 +123,13 @@ function Make(Ord) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -152,9 +152,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = Curry._2(Ord.compare, x, param.v);
       if (c === 0) {
@@ -171,9 +171,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -191,9 +191,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -210,9 +210,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -246,9 +246,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -266,9 +266,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -285,9 +285,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -347,16 +347,16 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -371,9 +371,9 @@ function Make(Ord) {
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -384,16 +384,16 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -408,9 +408,9 @@ function Make(Ord) {
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -419,10 +419,10 @@ function Make(Ord) {
   var remove_min_binding = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -473,13 +473,13 @@ function Make(Ord) {
       var data = Curry._1(f, undefined);
       if (data !== undefined) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: Caml_option.valFromOption(data),
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: Caml_option.valFromOption(data),
+          r: "Empty",
+          h: 1
+        };
       } else {
         return "Empty";
       }
@@ -499,13 +499,13 @@ function Make(Ord) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data$2,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data$2,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -543,13 +543,13 @@ function Make(Ord) {
     var d$p = Curry._1(f, param.d);
     var r$p = map(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: param.v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: param.v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var mapi = function (f, param) {
     if (typeof param !== "object") {
@@ -560,13 +560,13 @@ function Make(Ord) {
     var d$p = Curry._2(f, v, param.d);
     var r$p = mapi(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var fold = function (f, _m, _accu) {
     while(true) {
@@ -663,10 +663,10 @@ function Make(Ord) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
+        "Empty",
+        undefined,
+        "Empty"
+      ];
     }
     var r = param.r;
     var d = param.d;
@@ -675,25 +675,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
+        l,
+        Caml_option.some(d),
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, d, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, d, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var merge$1 = function (f, s1, s2) {
     if (typeof s1 !== "object") {
@@ -711,14 +711,14 @@ function Make(Ord) {
     }
     if (typeof s2 !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "mapLabels.res",
-              552,
-              11
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "mapLabels.res",
+          552,
+          11
+        ],
+        Error: new Error()
+      };
     }
     var v2 = s2.v;
     var match$1 = split(v2, s1);
@@ -780,9 +780,9 @@ function Make(Ord) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var d = param.d;
     var v = param.v;
@@ -795,14 +795,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pvd) {
       return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, d, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, d, rf)
+      ];
     }
   };
   var cons_enum = function (_m, _e) {
@@ -908,56 +908,56 @@ function Make(Ord) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          height: height,
-          create: create,
-          singleton: singleton,
-          bal: bal,
-          empty: "Empty",
-          is_empty: is_empty,
-          add: add,
-          find: find,
-          find_first_aux: find_first_aux,
-          find_first: find_first,
-          find_first_opt_aux: find_first_opt_aux,
-          find_first_opt: find_first_opt,
-          find_last_aux: find_last_aux,
-          find_last: find_last,
-          find_last_opt_aux: find_last_opt_aux,
-          find_last_opt: find_last_opt,
-          find_opt: find_opt,
-          mem: mem,
-          min_binding: min_binding,
-          min_binding_opt: min_binding_opt,
-          max_binding: max_binding,
-          max_binding_opt: max_binding_opt,
-          remove_min_binding: remove_min_binding,
-          remove: remove,
-          update: update,
-          iter: iter,
-          map: map,
-          mapi: mapi,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          add_min_binding: add_min_binding,
-          add_max_binding: add_max_binding,
-          join: join,
-          concat: concat,
-          concat_or_join: concat_or_join,
-          split: split,
-          merge: merge$1,
-          union: union,
-          filter: filter,
-          partition: partition,
-          cons_enum: cons_enum,
-          compare: compare,
-          equal: equal,
-          cardinal: cardinal,
-          bindings_aux: bindings_aux,
-          bindings: bindings,
-          choose: min_binding,
-          choose_opt: min_binding_opt
-        };
+    height: height,
+    create: create,
+    singleton: singleton,
+    bal: bal,
+    empty: "Empty",
+    is_empty: is_empty,
+    add: add,
+    find: find,
+    find_first_aux: find_first_aux,
+    find_first: find_first,
+    find_first_opt_aux: find_first_opt_aux,
+    find_first_opt: find_first_opt,
+    find_last_aux: find_last_aux,
+    find_last: find_last,
+    find_last_opt_aux: find_last_opt_aux,
+    find_last_opt: find_last_opt,
+    find_opt: find_opt,
+    mem: mem,
+    min_binding: min_binding,
+    min_binding_opt: min_binding_opt,
+    max_binding: max_binding,
+    max_binding_opt: max_binding_opt,
+    remove_min_binding: remove_min_binding,
+    remove: remove,
+    update: update,
+    iter: iter,
+    map: map,
+    mapi: mapi,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    add_min_binding: add_min_binding,
+    add_max_binding: add_max_binding,
+    join: join,
+    concat: concat,
+    concat_or_join: concat_or_join,
+    split: split,
+    merge: merge$1,
+    union: union,
+    filter: filter,
+    partition: partition,
+    cons_enum: cons_enum,
+    compare: compare,
+    equal: equal,
+    cardinal: cardinal,
+    bindings_aux: bindings_aux,
+    bindings: bindings,
+    choose: min_binding,
+    choose_opt: min_binding_opt
+  };
 }
 
 export {
diff --git a/lib/es6/moreLabels.js b/lib/es6/moreLabels.js
index ea81848e68b..05af6cd5ccb 100644
--- a/lib/es6/moreLabels.js
+++ b/lib/es6/moreLabels.js
@@ -45,23 +45,23 @@ var $$Map = {
         var hl = height(l);
         var hr = height(r);
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: d,
-                r: r,
-                h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: d,
+          r: r,
+          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+        };
       };
       var singleton = function (x, d) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: d,
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: d,
+          r: "Empty",
+          h: 1
+        };
       };
       var bal = function (l, x, d, r) {
         var hl;
@@ -71,10 +71,10 @@ var $$Map = {
         if (hl > (hr + 2 | 0)) {
           if (typeof l !== "object") {
             throw {
-                  RE_EXN_ID: "Invalid_argument",
-                  _1: "Map.bal",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Invalid_argument",
+              _1: "Map.bal",
+              Error: new Error()
+            };
           }
           var lr = l.r;
           var ld = l.d;
@@ -87,27 +87,27 @@ var $$Map = {
             return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
           }
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.bal",
+            Error: new Error()
+          };
         }
         if (hr <= (hl + 2 | 0)) {
           return {
-                  TAG: "Node",
-                  l: l,
-                  v: x,
-                  d: d,
-                  r: r,
-                  h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-                };
+            TAG: "Node",
+            l: l,
+            v: x,
+            d: d,
+            r: r,
+            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+          };
         }
         if (typeof r !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.bal",
+            Error: new Error()
+          };
         }
         var rr = r.r;
         var rd = r.d;
@@ -120,10 +120,10 @@ var $$Map = {
           return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
         }
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       };
       var is_empty = function (param) {
         if (typeof param !== "object") {
@@ -135,13 +135,13 @@ var $$Map = {
       var add = function (x, data, param) {
         if (typeof param !== "object") {
           return {
-                  TAG: "Node",
-                  l: "Empty",
-                  v: x,
-                  d: data,
-                  r: "Empty",
-                  h: 1
-                };
+            TAG: "Node",
+            l: "Empty",
+            v: x,
+            d: data,
+            r: "Empty",
+            h: 1
+          };
         }
         var r = param.r;
         var d = param.d;
@@ -153,13 +153,13 @@ var $$Map = {
             return param;
           } else {
             return {
-                    TAG: "Node",
-                    l: l,
-                    v: x,
-                    d: data,
-                    r: r,
-                    h: param.h
-                  };
+              TAG: "Node",
+              l: l,
+              v: x,
+              d: data,
+              r: r,
+              h: param.h
+            };
           }
         }
         if (c < 0) {
@@ -182,9 +182,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var c = Curry._2(funarg.compare, x, param.v);
           if (c === 0) {
@@ -201,9 +201,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -221,9 +221,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -240,9 +240,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -276,9 +276,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -296,9 +296,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -315,9 +315,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -377,16 +377,16 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var l = param.l;
           if (typeof l !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = l;
           continue ;
@@ -401,9 +401,9 @@ var $$Map = {
           var l = param.l;
           if (typeof l !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = l;
           continue ;
@@ -414,16 +414,16 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var r = param.r;
           if (typeof r !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = r;
           continue ;
@@ -438,9 +438,9 @@ var $$Map = {
           var r = param.r;
           if (typeof r !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = r;
           continue ;
@@ -449,10 +449,10 @@ var $$Map = {
       var remove_min_binding = function (param) {
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.remove_min_elt",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.remove_min_elt",
+            Error: new Error()
+          };
         }
         var l = param.l;
         if (typeof l !== "object") {
@@ -503,13 +503,13 @@ var $$Map = {
           var data = Curry._1(f, undefined);
           if (data !== undefined) {
             return {
-                    TAG: "Node",
-                    l: "Empty",
-                    v: x,
-                    d: Caml_option.valFromOption(data),
-                    r: "Empty",
-                    h: 1
-                  };
+              TAG: "Node",
+              l: "Empty",
+              v: x,
+              d: Caml_option.valFromOption(data),
+              r: "Empty",
+              h: 1
+            };
           } else {
             return "Empty";
           }
@@ -529,13 +529,13 @@ var $$Map = {
             return param;
           } else {
             return {
-                    TAG: "Node",
-                    l: l,
-                    v: x,
-                    d: data$2,
-                    r: r,
-                    h: param.h
-                  };
+              TAG: "Node",
+              l: l,
+              v: x,
+              d: data$2,
+              r: r,
+              h: param.h
+            };
           }
         }
         if (c < 0) {
@@ -573,13 +573,13 @@ var $$Map = {
         var d$p = Curry._1(f, param.d);
         var r$p = map(f, param.r);
         return {
-                TAG: "Node",
-                l: l$p,
-                v: param.v,
-                d: d$p,
-                r: r$p,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l$p,
+          v: param.v,
+          d: d$p,
+          r: r$p,
+          h: param.h
+        };
       };
       var mapi = function (f, param) {
         if (typeof param !== "object") {
@@ -590,13 +590,13 @@ var $$Map = {
         var d$p = Curry._2(f, v, param.d);
         var r$p = mapi(f, param.r);
         return {
-                TAG: "Node",
-                l: l$p,
-                v: v,
-                d: d$p,
-                r: r$p,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l$p,
+          v: v,
+          d: d$p,
+          r: r$p,
+          h: param.h
+        };
       };
       var fold = function (f, _m, _accu) {
         while(true) {
@@ -693,10 +693,10 @@ var $$Map = {
       var split = function (x, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  undefined,
-                  "Empty"
-                ];
+            "Empty",
+            undefined,
+            "Empty"
+          ];
         }
         var r = param.r;
         var d = param.d;
@@ -705,25 +705,25 @@ var $$Map = {
         var c = Curry._2(funarg.compare, x, v);
         if (c === 0) {
           return [
-                  l,
-                  Caml_option.some(d),
-                  r
-                ];
+            l,
+            Caml_option.some(d),
+            r
+          ];
         }
         if (c < 0) {
           var match = split(x, l);
           return [
-                  match[0],
-                  match[1],
-                  join(match[2], v, d, r)
-                ];
+            match[0],
+            match[1],
+            join(match[2], v, d, r)
+          ];
         }
         var match$1 = split(x, r);
         return [
-                join(l, v, d, match$1[0]),
-                match$1[1],
-                match$1[2]
-              ];
+          join(l, v, d, match$1[0]),
+          match$1[1],
+          match$1[2]
+        ];
       };
       var merge$1 = function (f, s1, s2) {
         if (typeof s1 !== "object") {
@@ -741,14 +741,14 @@ var $$Map = {
         }
         if (typeof s2 !== "object") {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "mapLabels.res",
-                  552,
-                  11
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "mapLabels.res",
+              552,
+              11
+            ],
+            Error: new Error()
+          };
         }
         var v2 = s2.v;
         var match$1 = split(v2, s1);
@@ -810,9 +810,9 @@ var $$Map = {
       var partition = function (p, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  "Empty"
-                ];
+            "Empty",
+            "Empty"
+          ];
         }
         var d = param.d;
         var v = param.v;
@@ -825,14 +825,14 @@ var $$Map = {
         var rt = match$1[0];
         if (pvd) {
           return [
-                  join(lt, v, d, rt),
-                  concat(lf, rf)
-                ];
+            join(lt, v, d, rt),
+            concat(lf, rf)
+          ];
         } else {
           return [
-                  concat(lt, rt),
-                  join(lf, v, d, rf)
-                ];
+            concat(lt, rt),
+            join(lf, v, d, rf)
+          ];
         }
       };
       var cons_enum = function (_m, _e) {
@@ -938,41 +938,41 @@ var $$Map = {
         return bindings_aux(/* [] */0, s);
       };
       return {
-              empty: "Empty",
-              is_empty: is_empty,
-              mem: mem,
-              add: add,
-              update: update,
-              singleton: singleton,
-              remove: remove,
-              merge: merge$1,
-              union: union,
-              compare: compare,
-              equal: equal,
-              iter: iter,
-              fold: fold,
-              for_all: for_all,
-              exists: exists,
-              filter: filter,
-              partition: partition,
-              cardinal: cardinal,
-              bindings: bindings,
-              min_binding: min_binding,
-              min_binding_opt: min_binding_opt,
-              max_binding: max_binding,
-              max_binding_opt: max_binding_opt,
-              choose: min_binding,
-              choose_opt: min_binding_opt,
-              split: split,
-              find: find,
-              find_opt: find_opt,
-              find_first: find_first,
-              find_first_opt: find_first_opt,
-              find_last: find_last,
-              find_last_opt: find_last_opt,
-              map: map,
-              mapi: mapi
-            };
+        empty: "Empty",
+        is_empty: is_empty,
+        mem: mem,
+        add: add,
+        update: update,
+        singleton: singleton,
+        remove: remove,
+        merge: merge$1,
+        union: union,
+        compare: compare,
+        equal: equal,
+        iter: iter,
+        fold: fold,
+        for_all: for_all,
+        exists: exists,
+        filter: filter,
+        partition: partition,
+        cardinal: cardinal,
+        bindings: bindings,
+        min_binding: min_binding,
+        min_binding_opt: min_binding_opt,
+        max_binding: max_binding,
+        max_binding_opt: max_binding_opt,
+        choose: min_binding,
+        choose_opt: min_binding_opt,
+        split: split,
+        find: find,
+        find_opt: find_opt,
+        find_first: find_first,
+        find_first_opt: find_first_opt,
+        find_last: find_last,
+        find_last_opt: find_last_opt,
+        map: map,
+        mapi: mapi
+      };
     })
 };
 
@@ -991,12 +991,12 @@ var $$Set = {
         var hr;
         hr = typeof r !== "object" ? 0 : r.h;
         return {
-                TAG: "Node",
-                l: l,
-                v: v,
-                r: r,
-                h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-              };
+          TAG: "Node",
+          l: l,
+          v: v,
+          r: r,
+          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+        };
       };
       var bal = function (l, v, r) {
         var hl;
@@ -1006,10 +1006,10 @@ var $$Set = {
         if (hl > (hr + 2 | 0)) {
           if (typeof l !== "object") {
             throw {
-                  RE_EXN_ID: "Invalid_argument",
-                  _1: "Set.bal",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Invalid_argument",
+              _1: "Set.bal",
+              Error: new Error()
+            };
           }
           var lr = l.r;
           var lv = l.v;
@@ -1021,26 +1021,26 @@ var $$Set = {
             return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
           }
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.bal",
+            Error: new Error()
+          };
         }
         if (hr <= (hl + 2 | 0)) {
           return {
-                  TAG: "Node",
-                  l: l,
-                  v: v,
-                  r: r,
-                  h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-                };
+            TAG: "Node",
+            l: l,
+            v: v,
+            r: r,
+            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+          };
         }
         if (typeof r !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.bal",
+            Error: new Error()
+          };
         }
         var rr = r.r;
         var rv = r.v;
@@ -1052,20 +1052,20 @@ var $$Set = {
           return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
         }
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       };
       var add = function (x, param) {
         if (typeof param !== "object") {
           return {
-                  TAG: "Node",
-                  l: "Empty",
-                  v: x,
-                  r: "Empty",
-                  h: 1
-                };
+            TAG: "Node",
+            l: "Empty",
+            v: x,
+            r: "Empty",
+            h: 1
+          };
         }
         var r = param.r;
         var v = param.v;
@@ -1091,12 +1091,12 @@ var $$Set = {
       };
       var singleton = function (x) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          r: "Empty",
+          h: 1
+        };
       };
       var add_min_element = function (x, param) {
         if (typeof param !== "object") {
@@ -1134,9 +1134,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var l = param.l;
           if (typeof l !== "object") {
@@ -1165,9 +1165,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var r = param.r;
           if (typeof r !== "object") {
@@ -1194,10 +1194,10 @@ var $$Set = {
       var remove_min_elt = function (param) {
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.remove_min_elt",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.remove_min_elt",
+            Error: new Error()
+          };
         }
         var l = param.l;
         if (typeof l !== "object") {
@@ -1227,10 +1227,10 @@ var $$Set = {
       var split = function (x, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  false,
-                  "Empty"
-                ];
+            "Empty",
+            false,
+            "Empty"
+          ];
         }
         var r = param.r;
         var v = param.v;
@@ -1238,25 +1238,25 @@ var $$Set = {
         var c = Curry._2(funarg.compare, x, v);
         if (c === 0) {
           return [
-                  l,
-                  true,
-                  r
-                ];
+            l,
+            true,
+            r
+          ];
         }
         if (c < 0) {
           var match = split(x, l);
           return [
-                  match[0],
-                  match[1],
-                  join(match[2], v, r)
-                ];
+            match[0],
+            match[1],
+            join(match[2], v, r)
+          ];
         }
         var match$1 = split(x, r);
         return [
-                join(l, v, match$1[0]),
-                match$1[1],
-                match$1[2]
-              ];
+          join(l, v, match$1[0]),
+          match$1[1],
+          match$1[2]
+        ];
       };
       var is_empty = function (param) {
         if (typeof param !== "object") {
@@ -1540,9 +1540,9 @@ var $$Set = {
       var partition = function (p, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  "Empty"
-                ];
+            "Empty",
+            "Empty"
+          ];
         }
         var v = param.v;
         var match = partition(p, param.l);
@@ -1554,14 +1554,14 @@ var $$Set = {
         var rt = match$1[0];
         if (pv) {
           return [
-                  join(lt, v, rt),
-                  concat(lf, rf)
-                ];
+            join(lt, v, rt),
+            concat(lf, rf)
+          ];
         } else {
           return [
-                  concat(lt, rt),
-                  join(lf, v, rf)
-                ];
+            concat(lt, rt),
+            join(lf, v, rf)
+          ];
         }
       };
       var cardinal = function (param) {
@@ -1594,9 +1594,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           var c = Curry._2(funarg.compare, x, v);
@@ -1629,9 +1629,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -1694,9 +1694,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -1780,21 +1780,21 @@ var $$Set = {
           switch (n) {
             case 0 :
                 return [
-                        "Empty",
-                        l
-                      ];
+                  "Empty",
+                  l
+                ];
             case 1 :
                 if (l) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          l.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    l.tl
+                  ];
                 }
                 break;
             case 2 :
@@ -1802,21 +1802,21 @@ var $$Set = {
                   var match = l.tl;
                   if (match) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match.hd,
-                              r: "Empty",
-                              h: 2
-                            },
-                            match.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match.hd,
+                        r: "Empty",
+                        h: 2
+                      },
+                      match.tl
+                    ];
                   }
                   
                 }
@@ -1828,27 +1828,27 @@ var $$Set = {
                     var match$2 = match$1.tl;
                     if (match$2) {
                       return [
-                              {
-                                TAG: "Node",
-                                l: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: l.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                v: match$1.hd,
-                                r: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: match$2.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                h: 2
-                              },
-                              match$2.tl
-                            ];
+                        {
+                          TAG: "Node",
+                          l: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: l.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          v: match$1.hd,
+                          r: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: match$2.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          h: 2
+                        },
+                        match$2.tl
+                      ];
                     }
                     
                   }
@@ -1864,19 +1864,19 @@ var $$Set = {
           if (l$1) {
             var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
             return [
-                    create(match$3[0], l$1.hd, match$4[0]),
-                    match$4[1]
-                  ];
+              create(match$3[0], l$1.hd, match$4[0]),
+              match$4[1]
+            ];
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "setLabels.res",
-                  691,
-                  20
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "setLabels.res",
+              691,
+              20
+            ],
+            Error: new Error()
+          };
         };
         return sub(List.length(l), l)[0];
       };
@@ -1912,42 +1912,42 @@ var $$Set = {
         }
       };
       return {
-              empty: "Empty",
-              is_empty: is_empty,
-              mem: mem,
-              add: add,
-              singleton: singleton,
-              remove: remove,
-              union: union,
-              inter: inter,
-              diff: diff,
-              compare: compare,
-              equal: equal,
-              subset: subset,
-              iter: iter,
-              map: map,
-              fold: fold,
-              for_all: for_all,
-              exists: exists,
-              filter: filter,
-              partition: partition,
-              cardinal: cardinal,
-              elements: elements,
-              min_elt: min_elt,
-              min_elt_opt: min_elt_opt,
-              max_elt: max_elt,
-              max_elt_opt: max_elt_opt,
-              choose: min_elt,
-              choose_opt: min_elt_opt,
-              split: split,
-              find: find,
-              find_opt: find_opt,
-              find_first: find_first,
-              find_first_opt: find_first_opt,
-              find_last: find_last,
-              find_last_opt: find_last_opt,
-              of_list: of_list
-            };
+        empty: "Empty",
+        is_empty: is_empty,
+        mem: mem,
+        add: add,
+        singleton: singleton,
+        remove: remove,
+        union: union,
+        inter: inter,
+        diff: diff,
+        compare: compare,
+        equal: equal,
+        subset: subset,
+        iter: iter,
+        map: map,
+        fold: fold,
+        for_all: for_all,
+        exists: exists,
+        filter: filter,
+        partition: partition,
+        cardinal: cardinal,
+        elements: elements,
+        min_elt: min_elt,
+        min_elt_opt: min_elt_opt,
+        max_elt: max_elt,
+        max_elt_opt: max_elt_opt,
+        choose: min_elt,
+        choose_opt: min_elt_opt,
+        split: split,
+        find: find,
+        find_opt: find_opt,
+        find_first: find_first,
+        find_first_opt: find_first_opt,
+        find_last: find_last,
+        find_last_opt: find_last_opt,
+        of_list: of_list
+      };
     })
 };
 
diff --git a/lib/es6/parsing.js b/lib/es6/parsing.js
index fc0655d966d..f491b008dc9 100644
--- a/lib/es6/parsing.js
+++ b/lib/es6/parsing.js
@@ -89,9 +89,9 @@ function yyparse(tables, start, lexer, lexbuf) {
             continue ;
         case "Raise_parse_error" :
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
         case "Grow_stacks_1" :
             grow_stacks();
             _arg = undefined;
diff --git a/lib/es6/pervasives.js b/lib/es6/pervasives.js
index f6daf9d40a3..c0424139a19 100644
--- a/lib/es6/pervasives.js
+++ b/lib/es6/pervasives.js
@@ -15,18 +15,18 @@ var JsxModules = {
 
 function failwith(s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function invalid_arg(s) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit");
@@ -64,10 +64,10 @@ function classify_float(x) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "char_of_int",
+      Error: new Error()
+    };
   }
   return n;
 }
@@ -88,10 +88,10 @@ function bool_of_string(param) {
         return true;
     default:
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "bool_of_string",
+        Error: new Error()
+      };
   }
 }
 
@@ -163,9 +163,9 @@ function float_of_string_opt(s) {
 function $at(l1, l2) {
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: $at(l1.tl, l2)
+    };
   } else {
     return l2;
   }
diff --git a/lib/es6/pervasivesU.js b/lib/es6/pervasivesU.js
index 88c672d8cfc..76997d849fd 100644
--- a/lib/es6/pervasivesU.js
+++ b/lib/es6/pervasivesU.js
@@ -14,18 +14,18 @@ var JsxModules = {
 
 function failwith(s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function invalid_arg(s) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit");
@@ -63,10 +63,10 @@ function classify_float(x) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "char_of_int",
+      Error: new Error()
+    };
   }
   return n;
 }
@@ -87,10 +87,10 @@ function bool_of_string(param) {
         return true;
     default:
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "bool_of_string",
+        Error: new Error()
+      };
   }
 }
 
@@ -162,9 +162,9 @@ function float_of_string_opt(s) {
 function $at(l1, l2) {
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: $at(l1.tl, l2)
+    };
   } else {
     return l2;
   }
diff --git a/lib/es6/queue.js b/lib/es6/queue.js
index a6e8b028006..05d502d4a68 100644
--- a/lib/es6/queue.js
+++ b/lib/es6/queue.js
@@ -7,10 +7,10 @@ var Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty");
 
 function create(param) {
   return {
-          length: 0,
-          first: "Nil",
-          last: "Nil"
-        };
+    length: 0,
+    first: "Nil",
+    last: "Nil"
+  };
 }
 
 function clear(q) {
@@ -43,18 +43,18 @@ function peek(q) {
     return match.content;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function take(q) {
   var match = q.first;
   if (typeof match !== "object") {
     throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
+      RE_EXN_ID: Empty,
+      Error: new Error()
+    };
   }
   var content = match.content;
   var next = match.next;
diff --git a/lib/es6/random.js b/lib/es6/random.js
index 46c0844a00b..d91fca26d15 100644
--- a/lib/es6/random.js
+++ b/lib/es6/random.js
@@ -76,10 +76,10 @@ function bits(s) {
 function $$int(s, bound) {
   if (bound > 1073741823 || bound <= 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int",
+      Error: new Error()
+    };
   }
   while(true) {
     var r = bits(s);
@@ -94,10 +94,10 @@ function $$int(s, bound) {
 function int32(s, bound) {
   if (bound <= 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int32",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int32",
+      Error: new Error()
+    };
   }
   while(true) {
     var b1 = bits(s);
@@ -114,10 +114,10 @@ function int32(s, bound) {
 function int64(s, bound) {
   if (Caml.i64_le(bound, Caml_int64.zero)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int64",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int64",
+      Error: new Error()
+    };
   }
   while(true) {
     var b1 = Caml_int64.of_int32(bits(s));
diff --git a/lib/es6/set.js b/lib/es6/set.js
index 99645863e99..0606e044945 100644
--- a/lib/es6/set.js
+++ b/lib/es6/set.js
@@ -18,12 +18,12 @@ function Make(funarg) {
     var hr;
     hr = typeof r !== "object" ? 0 : r.h;
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var bal = function (l, v, r) {
     var hl;
@@ -33,10 +33,10 @@ function Make(funarg) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var lv = l.v;
@@ -48,26 +48,26 @@ function Make(funarg) {
         return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: v,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: v,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rv = r.v;
@@ -79,20 +79,20 @@ function Make(funarg) {
       return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   };
   var add = function (x, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var v = param.v;
@@ -118,12 +118,12 @@ function Make(funarg) {
   };
   var singleton = function (x) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   };
   var add_min_element = function (x, param) {
     if (typeof param !== "object") {
@@ -161,9 +161,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
@@ -192,9 +192,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
@@ -221,10 +221,10 @@ function Make(funarg) {
   var remove_min_elt = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -245,10 +245,10 @@ function Make(funarg) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              false,
-              "Empty"
-            ];
+        "Empty",
+        false,
+        "Empty"
+      ];
     }
     var r = param.r;
     var v = param.v;
@@ -256,25 +256,25 @@ function Make(funarg) {
     var c = Curry._2(funarg.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -563,9 +563,9 @@ function Make(funarg) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var v = param.v;
     var match = partition(p, param.l);
@@ -577,14 +577,14 @@ function Make(funarg) {
     var rt = match$1[0];
     if (pv) {
       return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, rf)
+      ];
     }
   };
   var cardinal = function (param) {
@@ -617,9 +617,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       var c = Curry._2(funarg.compare, x, v);
@@ -635,9 +635,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -698,9 +698,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -817,21 +817,21 @@ function Make(funarg) {
           switch (n) {
             case 0 :
                 return [
-                        "Empty",
-                        l
-                      ];
+                  "Empty",
+                  l
+                ];
             case 1 :
                 if (l) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          l.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    l.tl
+                  ];
                 }
                 break;
             case 2 :
@@ -839,21 +839,21 @@ function Make(funarg) {
                   var match = l.tl;
                   if (match) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match.hd,
-                              r: "Empty",
-                              h: 2
-                            },
-                            match.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match.hd,
+                        r: "Empty",
+                        h: 2
+                      },
+                      match.tl
+                    ];
                   }
                   
                 }
@@ -865,27 +865,27 @@ function Make(funarg) {
                     var match$2 = match$1.tl;
                     if (match$2) {
                       return [
-                              {
-                                TAG: "Node",
-                                l: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: l.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                v: match$1.hd,
-                                r: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: match$2.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                h: 2
-                              },
-                              match$2.tl
-                            ];
+                        {
+                          TAG: "Node",
+                          l: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: l.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          v: match$1.hd,
+                          r: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: match$2.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          h: 2
+                        },
+                        match$2.tl
+                      ];
                     }
                     
                   }
@@ -901,19 +901,19 @@ function Make(funarg) {
           if (l$1) {
             var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
             return [
-                    create(match$3[0], l$1.hd, match$4[0]),
-                    match$4[1]
-                  ];
+              create(match$3[0], l$1.hd, match$4[0]),
+              match$4[1]
+            ];
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "set.res",
-                  691,
-                  20
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "set.res",
+              691,
+              20
+            ],
+            Error: new Error()
+          };
         };
         return sub(List.length(l$1), l$1)[0];
       } else {
@@ -924,42 +924,42 @@ function Make(funarg) {
     }
   };
   return {
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          add: add,
-          singleton: singleton,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          map: map,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements: elements,
-          min_elt: min_elt,
-          min_elt_opt: min_elt_opt,
-          max_elt: max_elt,
-          max_elt_opt: max_elt_opt,
-          choose: min_elt,
-          choose_opt: min_elt_opt,
-          split: split,
-          find: find,
-          find_opt: find_opt,
-          find_first: find_first,
-          find_first_opt: find_first_opt,
-          find_last: find_last,
-          find_last_opt: find_last_opt,
-          of_list: of_list
-        };
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    add: add,
+    singleton: singleton,
+    remove: remove,
+    union: union,
+    inter: inter,
+    diff: diff,
+    compare: compare,
+    equal: equal,
+    subset: subset,
+    iter: iter,
+    map: map,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    elements: elements,
+    min_elt: min_elt,
+    min_elt_opt: min_elt_opt,
+    max_elt: max_elt,
+    max_elt_opt: max_elt_opt,
+    choose: min_elt,
+    choose_opt: min_elt_opt,
+    split: split,
+    find: find,
+    find_opt: find_opt,
+    find_first: find_first,
+    find_first_opt: find_first_opt,
+    find_last: find_last,
+    find_last_opt: find_last_opt,
+    of_list: of_list
+  };
 }
 
 export {
diff --git a/lib/es6/setLabels.js b/lib/es6/setLabels.js
index a89a70adf8f..121ae00fa59 100644
--- a/lib/es6/setLabels.js
+++ b/lib/es6/setLabels.js
@@ -18,12 +18,12 @@ function Make(Ord) {
     var hr;
     hr = typeof r !== "object" ? 0 : r.h;
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var bal = function (l, v, r) {
     var hl;
@@ -33,10 +33,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var lv = l.v;
@@ -48,26 +48,26 @@ function Make(Ord) {
         return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: v,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: v,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rv = r.v;
@@ -79,20 +79,20 @@ function Make(Ord) {
       return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   };
   var add = function (x, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var v = param.v;
@@ -118,12 +118,12 @@ function Make(Ord) {
   };
   var singleton = function (x) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   };
   var add_min_element = function (x, param) {
     if (typeof param !== "object") {
@@ -161,9 +161,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
@@ -192,9 +192,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
@@ -221,10 +221,10 @@ function Make(Ord) {
   var remove_min_elt = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -254,10 +254,10 @@ function Make(Ord) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              false,
-              "Empty"
-            ];
+        "Empty",
+        false,
+        "Empty"
+      ];
     }
     var r = param.r;
     var v = param.v;
@@ -265,25 +265,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -567,9 +567,9 @@ function Make(Ord) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var v = param.v;
     var match = partition(p, param.l);
@@ -581,14 +581,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pv) {
       return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, rf)
+      ];
     }
   };
   var cardinal = function (param) {
@@ -621,9 +621,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       var c = Curry._2(Ord.compare, x, v);
@@ -656,9 +656,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -721,9 +721,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -807,21 +807,21 @@ function Make(Ord) {
       switch (n) {
         case 0 :
             return [
-                    "Empty",
-                    l
-                  ];
+              "Empty",
+              l
+            ];
         case 1 :
             if (l) {
               return [
-                      {
-                        TAG: "Node",
-                        l: "Empty",
-                        v: l.hd,
-                        r: "Empty",
-                        h: 1
-                      },
-                      l.tl
-                    ];
+                {
+                  TAG: "Node",
+                  l: "Empty",
+                  v: l.hd,
+                  r: "Empty",
+                  h: 1
+                },
+                l.tl
+              ];
             }
             break;
         case 2 :
@@ -829,21 +829,21 @@ function Make(Ord) {
               var match = l.tl;
               if (match) {
                 return [
-                        {
-                          TAG: "Node",
-                          l: {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          v: match.hd,
-                          r: "Empty",
-                          h: 2
-                        },
-                        match.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    l: {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    v: match.hd,
+                    r: "Empty",
+                    h: 2
+                  },
+                  match.tl
+                ];
               }
               
             }
@@ -855,27 +855,27 @@ function Make(Ord) {
                 var match$2 = match$1.tl;
                 if (match$2) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match$1.hd,
-                            r: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: match$2.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            h: 2
-                          },
-                          match$2.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: l.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      v: match$1.hd,
+                      r: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: match$2.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      h: 2
+                    },
+                    match$2.tl
+                  ];
                 }
                 
               }
@@ -891,19 +891,19 @@ function Make(Ord) {
       if (l$1) {
         var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
         return [
-                create(match$3[0], l$1.hd, match$4[0]),
-                match$4[1]
-              ];
+          create(match$3[0], l$1.hd, match$4[0]),
+          match$4[1]
+        ];
       }
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "setLabels.res",
-              691,
-              20
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "setLabels.res",
+          691,
+          20
+        ],
+        Error: new Error()
+      };
     };
     return sub(List.length(l), l)[0];
   };
@@ -939,60 +939,60 @@ function Make(Ord) {
     }
   };
   return {
-          height: height,
-          create: create,
-          bal: bal,
-          add: add,
-          singleton: singleton,
-          add_min_element: add_min_element,
-          add_max_element: add_max_element,
-          join: join,
-          min_elt: min_elt,
-          min_elt_opt: min_elt_opt,
-          max_elt: max_elt,
-          max_elt_opt: max_elt_opt,
-          remove_min_elt: remove_min_elt,
-          merge: merge,
-          concat: concat,
-          split: split,
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          cons_enum: cons_enum,
-          compare_aux: compare_aux,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements_aux: elements_aux,
-          elements: elements,
-          choose: min_elt,
-          choose_opt: min_elt_opt,
-          find: find,
-          find_first_aux: find_first_aux,
-          find_first: find_first,
-          find_first_opt_aux: find_first_opt_aux,
-          find_first_opt: find_first_opt,
-          find_last_aux: find_last_aux,
-          find_last: find_last,
-          find_last_opt_aux: find_last_opt_aux,
-          find_last_opt: find_last_opt,
-          find_opt: find_opt,
-          try_join: try_join,
-          map: map,
-          of_sorted_list: of_sorted_list,
-          of_list: of_list
-        };
+    height: height,
+    create: create,
+    bal: bal,
+    add: add,
+    singleton: singleton,
+    add_min_element: add_min_element,
+    add_max_element: add_max_element,
+    join: join,
+    min_elt: min_elt,
+    min_elt_opt: min_elt_opt,
+    max_elt: max_elt,
+    max_elt_opt: max_elt_opt,
+    remove_min_elt: remove_min_elt,
+    merge: merge,
+    concat: concat,
+    split: split,
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    remove: remove,
+    union: union,
+    inter: inter,
+    diff: diff,
+    cons_enum: cons_enum,
+    compare_aux: compare_aux,
+    compare: compare,
+    equal: equal,
+    subset: subset,
+    iter: iter,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    elements_aux: elements_aux,
+    elements: elements,
+    choose: min_elt,
+    choose_opt: min_elt_opt,
+    find: find,
+    find_first_aux: find_first_aux,
+    find_first: find_first,
+    find_first_opt_aux: find_first_opt_aux,
+    find_first_opt: find_first_opt,
+    find_last_aux: find_last_aux,
+    find_last: find_last,
+    find_last_opt_aux: find_last_opt_aux,
+    find_last_opt: find_last_opt,
+    find_opt: find_opt,
+    try_join: try_join,
+    map: map,
+    of_sorted_list: of_sorted_list,
+    of_list: of_list
+  };
 }
 
 export {
diff --git a/lib/es6/sort.js b/lib/es6/sort.js
index ae182a584c3..1baceba376a 100644
--- a/lib/es6/sort.js
+++ b/lib/es6/sort.js
@@ -13,14 +13,14 @@ function merge(order, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(order, h1, h2)) {
     return {
-            hd: h1,
-            tl: merge(order, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(order, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(order, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(order, l1, l2.tl)
+    };
   }
 }
 
@@ -33,30 +33,30 @@ function list(order, l) {
     var e = param.hd;
     if (!match) {
       return {
-              hd: {
-                hd: e,
-                tl: /* [] */0
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          hd: e,
+          tl: /* [] */0
+        },
+        tl: /* [] */0
+      };
     }
     var e2 = match.hd;
     return {
-            hd: Curry._2(order, e, e2) ? ({
-                  hd: e,
-                  tl: {
-                    hd: e2,
-                    tl: /* [] */0
-                  }
-                }) : ({
-                  hd: e2,
-                  tl: {
-                    hd: e,
-                    tl: /* [] */0
-                  }
-                }),
-            tl: initlist(match.tl)
-          };
+      hd: Curry._2(order, e, e2) ? ({
+          hd: e,
+          tl: {
+            hd: e2,
+            tl: /* [] */0
+          }
+        }) : ({
+          hd: e2,
+          tl: {
+            hd: e,
+            tl: /* [] */0
+          }
+        }),
+      tl: initlist(match.tl)
+    };
   };
   var merge2 = function (param) {
     if (!param) {
@@ -65,9 +65,9 @@ function list(order, l) {
     var match = param.tl;
     if (match) {
       return {
-              hd: merge(order, param.hd, match.hd),
-              tl: merge2(match.tl)
-            };
+        hd: merge(order, param.hd, match.hd),
+        tl: merge2(match.tl)
+      };
     } else {
       return param;
     }
@@ -116,10 +116,10 @@ function array(cmp, arr) {
       var j = hi - 1 | 0;
       if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Sort.array",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Sort.array",
+          Error: new Error()
+        };
       }
       while(i < j) {
         while(!Curry._2(cmp, pivot, arr[i])) {
diff --git a/lib/es6/stack.js b/lib/es6/stack.js
index e25da753584..ded2024b685 100644
--- a/lib/es6/stack.js
+++ b/lib/es6/stack.js
@@ -7,9 +7,9 @@ var Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty");
 
 function create(param) {
   return {
-          c: /* [] */0,
-          len: 0
-        };
+    c: /* [] */0,
+    len: 0
+  };
 }
 
 function clear(s) {
@@ -19,9 +19,9 @@ function clear(s) {
 
 function copy(s) {
   return {
-          c: s.c,
-          len: s.len
-        };
+    c: s.c,
+    len: s.len
+  };
 }
 
 function push(x, s) {
@@ -40,9 +40,9 @@ function pop(s) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function top(s) {
@@ -51,9 +51,9 @@ function top(s) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function is_empty(s) {
diff --git a/lib/es6/stream.js b/lib/es6/stream.js
index 77607119673..0ee28752e09 100644
--- a/lib/es6/stream.js
+++ b/lib/es6/stream.js
@@ -46,24 +46,24 @@ function get_data(count, _d) {
           }
           if (match.TAG === "Scons") {
             return {
-                    TAG: "Scons",
-                    _0: match._0,
-                    _1: {
-                      TAG: "Sapp",
-                      _0: match._1,
-                      _1: d2
-                    }
-                  };
+              TAG: "Scons",
+              _0: match._0,
+              _1: {
+                TAG: "Sapp",
+                _0: match._1,
+                _1: d2
+              }
+            };
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "stream.res",
-                  53,
-                  13
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "stream.res",
+              53,
+              13
+            ],
+            Error: new Error()
+          };
       case "Slazy" :
           _d = CamlinternalLazy.force(d._0);
           continue ;
@@ -75,10 +75,10 @@ function get_data(count, _d) {
             if (a !== undefined) {
               g.curr = undefined;
               return {
-                      TAG: "Scons",
-                      _0: Caml_option.valFromOption(a),
-                      _1: d
-                    };
+                TAG: "Scons",
+                _0: Caml_option.valFromOption(a),
+                _1: d
+              };
             } else {
               return "Sempty";
             }
@@ -86,10 +86,10 @@ function get_data(count, _d) {
           var a$1 = Curry._1(g.func, count);
           if (a$1 !== undefined) {
             return {
-                    TAG: "Scons",
-                    _0: Caml_option.valFromOption(a$1),
-                    _1: d
-                  };
+              TAG: "Scons",
+              _0: Caml_option.valFromOption(a$1),
+              _1: d
+            };
           } else {
             g.curr = Caml_option.some(undefined);
             return "Sempty";
@@ -118,14 +118,14 @@ function peek_data(s) {
             return Caml_option.some(d._0);
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "stream.res",
-                  83,
-                  13
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "stream.res",
+              83,
+              13
+            ],
+            Error: new Error()
+          };
       case "Slazy" :
           s.data = CamlinternalLazy.force(f._0);
           continue ;
@@ -190,34 +190,34 @@ function junk(param) {
 function nget_data(n, s) {
   if (n <= 0) {
     return [
-            /* [] */0,
-            s.data,
-            0
-          ];
+      /* [] */0,
+      s.data,
+      0
+    ];
   }
   var a = peek_data(s);
   if (a === undefined) {
     return [
-            /* [] */0,
-            s.data,
-            0
-          ];
+      /* [] */0,
+      s.data,
+      0
+    ];
   }
   var a$1 = Caml_option.valFromOption(a);
   junk_data(s);
   var match = nget_data(n - 1 | 0, s);
   return [
-          {
-            hd: a$1,
-            tl: match[0]
-          },
-          {
-            TAG: "Scons",
-            _0: a$1,
-            _1: match[1]
-          },
-          match[2] + 1 | 0
-        ];
+    {
+      hd: a$1,
+      tl: match[0]
+    },
+    {
+      TAG: "Scons",
+      _0: a$1,
+      _1: match[1]
+    },
+    match[2] + 1 | 0
+  ];
 }
 
 function npeek(n, param) {
@@ -238,9 +238,9 @@ function next(s) {
     return Caml_option.valFromOption(a);
   }
   throw {
-        RE_EXN_ID: Failure,
-        Error: new Error()
-      };
+    RE_EXN_ID: Failure,
+    Error: new Error()
+  };
 }
 
 function empty(s) {
@@ -249,9 +249,9 @@ function empty(s) {
     return;
   }
   throw {
-        RE_EXN_ID: Failure,
-        Error: new Error()
-      };
+    RE_EXN_ID: Failure,
+    Error: new Error()
+  };
 }
 
 function iter(f, strm) {
@@ -270,28 +270,28 @@ function iter(f, strm) {
 
 function from(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Sgen",
-            _0: {
-              curr: undefined,
-              func: f
-            }
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Sgen",
+      _0: {
+        curr: undefined,
+        func: f
+      }
+    }
+  };
 }
 
 function of_list(l) {
   return {
-          count: 0,
-          data: List.fold_right((function (x, l) {
-                  return {
-                          TAG: "Scons",
-                          _0: x,
-                          _1: l
-                        };
-                }), l, "Sempty")
-        };
+    count: 0,
+    data: List.fold_right((function (x, l) {
+            return {
+              TAG: "Scons",
+              _0: x,
+              _1: l
+            };
+          }), l, "Sempty")
+  };
 }
 
 function of_string(s) {
@@ -299,13 +299,13 @@ function of_string(s) {
     contents: 0
   };
   return from(function (param) {
-              var c = count.contents;
-              if (c < s.length) {
-                count.contents = count.contents + 1 | 0;
-                return Caml_string.get(s, c);
-              }
-              
-            });
+        var c = count.contents;
+        if (c < s.length) {
+          count.contents = count.contents + 1 | 0;
+          return Caml_string.get(s, c);
+        }
+        
+      });
 }
 
 function of_bytes(s) {
@@ -313,106 +313,106 @@ function of_bytes(s) {
     contents: 0
   };
   return from(function (param) {
-              var c = count.contents;
-              if (c < s.length) {
-                count.contents = count.contents + 1 | 0;
-                return Caml_bytes.get(s, c);
-              }
-              
-            });
+        var c = count.contents;
+        if (c < s.length) {
+          count.contents = count.contents + 1 | 0;
+          return Caml_bytes.get(s, c);
+        }
+        
+      });
 }
 
 function iapp(i, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Sapp",
-            _0: data(i),
-            _1: data(s)
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Sapp",
+      _0: data(i),
+      _1: data(s)
+    }
+  };
 }
 
 function icons(i, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Scons",
-            _0: i,
-            _1: data(s)
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Scons",
+      _0: i,
+      _1: data(s)
+    }
+  };
 }
 
 function ising(i) {
   return {
-          count: 0,
-          data: {
-            TAG: "Scons",
-            _0: i,
-            _1: "Sempty"
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Scons",
+      _0: i,
+      _1: "Sempty"
+    }
+  };
 }
 
 function lapp(f, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Sapp",
-                          _0: data(Curry._1(f, undefined)),
-                          _1: data(s)
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Sapp",
+              _0: data(Curry._1(f, undefined)),
+              _1: data(s)
+            };
+          })
+    }
+  };
 }
 
 function lcons(f, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Scons",
-                          _0: Curry._1(f, undefined),
-                          _1: data(s)
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Scons",
+              _0: Curry._1(f, undefined),
+              _1: data(s)
+            };
+          })
+    }
+  };
 }
 
 function lsing(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Scons",
-                          _0: Curry._1(f, undefined),
-                          _1: "Sempty"
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Scons",
+              _0: Curry._1(f, undefined),
+              _1: "Sempty"
+            };
+          })
+    }
+  };
 }
 
 function slazy(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return data(Curry._1(f, undefined));
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return data(Curry._1(f, undefined));
+          })
+    }
+  };
 }
 
 function dump_data(f, param) {
diff --git a/lib/es6/string.js b/lib/es6/string.js
index a340ef76905..a7dc394e98d 100644
--- a/lib/es6/string.js
+++ b/lib/es6/string.js
@@ -92,9 +92,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -130,10 +130,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -142,10 +142,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -155,9 +155,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -174,10 +174,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -203,10 +203,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -215,10 +215,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -240,10 +240,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
@@ -294,9 +294,9 @@ function split_on_char(sep, s) {
     
   }
   return {
-          hd: sub(s, 0, j),
-          tl: r
-        };
+    hd: sub(s, 0, j),
+    tl: r
+  };
 }
 
 var make = Caml_string.make;
diff --git a/lib/es6/stringLabels.js b/lib/es6/stringLabels.js
index 67fe3a00c07..4573393590f 100644
--- a/lib/es6/stringLabels.js
+++ b/lib/es6/stringLabels.js
@@ -94,9 +94,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -132,10 +132,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -144,10 +144,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -157,9 +157,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -176,10 +176,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -205,10 +205,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -217,10 +217,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -242,10 +242,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
@@ -296,9 +296,9 @@ function split_on_char(sep, s) {
     
   }
   return {
-          hd: sub(s, 0, j),
-          tl: r
-        };
+    hd: sub(s, 0, j),
+    tl: r
+  };
 }
 
 var make = Caml_string.make;
diff --git a/lib/es6/uchar.js b/lib/es6/uchar.js
index 27d9189e5af..1d56bc00bc9 100644
--- a/lib/es6/uchar.js
+++ b/lib/es6/uchar.js
@@ -17,10 +17,10 @@ function succ(u) {
   }
   if (u === 1114111) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "U+10FFFF has no successor",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "U+10FFFF has no successor",
+      Error: new Error()
+    };
   }
   return u + 1 | 0;
 }
@@ -31,10 +31,10 @@ function pred(u) {
   }
   if (u === 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "U+0000 has no predecessor",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "U+0000 has no predecessor",
+      Error: new Error()
+    };
   }
   return u - 1 | 0;
 }
@@ -55,10 +55,10 @@ function of_int(i) {
   }
   var s = err_not_sv(i);
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function is_char(u) {
@@ -75,10 +75,10 @@ function to_char(u) {
   }
   var s = err_not_latin1(u);
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function unsafe_to_char(prim) {
diff --git a/lib/js/arg.js b/lib/js/arg.js
index d4ed16fddba..1b0771070e9 100644
--- a/lib/js/arg.js
+++ b/lib/js/arg.js
@@ -33,9 +33,9 @@ function assoc3(x, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -43,16 +43,16 @@ function split(s) {
   var i = $$String.index(s, /* '=' */61);
   var len = s.length;
   return [
-          $$String.sub(s, 0, i),
-          $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0)
-        ];
+    $$String.sub(s, 0, i),
+    $$String.sub(s, i + 1 | 0, len - (i + 1 | 0) | 0)
+  ];
 }
 
 function make_symlist(prefix, sep, suffix, l) {
   if (l) {
     return List.fold_left((function (x, y) {
-                  return x + (sep + y);
-                }), prefix + l.hd, l.tl) + suffix;
+            return x + (sep + y);
+          }), prefix + l.hd, l.tl) + suffix;
   } else {
     return "<none>";
   }
@@ -60,13 +60,13 @@ function make_symlist(prefix, sep, suffix, l) {
 
 function help_action(param) {
   throw {
-        RE_EXN_ID: Stop,
-        _1: {
-          TAG: "Unknown",
-          _0: "-help"
-        },
-        Error: new Error()
-      };
+    RE_EXN_ID: Stop,
+    _1: {
+      TAG: "Unknown",
+      _0: "-help"
+    },
+    Error: new Error()
+  };
 }
 
 function add_help(speclist) {
@@ -225,14 +225,14 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             _0: "--help"
           })) {
       return {
-              RE_EXN_ID: Help,
-              _1: $$Buffer.contents(b)
-            };
+        RE_EXN_ID: Help,
+        _1: $$Buffer.contents(b)
+      };
     } else {
       return {
-              RE_EXN_ID: Bad,
-              _1: $$Buffer.contents(b)
-            };
+        RE_EXN_ID: Bad,
+        _1: $$Buffer.contents(b)
+      };
     }
   };
   current.contents = current.contents + 1 | 0;
@@ -261,13 +261,13 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
               var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
               if (exn$1.RE_EXN_ID === "Not_found") {
                 throw {
-                      RE_EXN_ID: Stop,
-                      _1: {
-                        TAG: "Unknown",
-                        _0: s
-                      },
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stop,
+                  _1: {
+                    TAG: "Unknown",
+                    _0: s
+                  },
+                  Error: new Error()
+                };
               }
               throw exn$1;
             }
@@ -282,15 +282,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             return;
           }
           throw {
-                RE_EXN_ID: Stop,
-                _1: {
-                  TAG: "Wrong",
-                  _0: s,
-                  _1: follow,
-                  _2: "no argument"
-                },
-                Error: new Error()
-              };
+            RE_EXN_ID: Stop,
+            _1: {
+              TAG: "Wrong",
+              _0: s,
+              _1: follow,
+              _2: "no argument"
+            },
+            Error: new Error()
+          };
         }
         }(s,follow));
         var get_arg = (function(s,follow){
@@ -302,13 +302,13 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             return Caml_array.get(argv.contents, current.contents + 1 | 0);
           }
           throw {
-                RE_EXN_ID: Stop,
-                _1: {
-                  TAG: "Missing",
-                  _0: s
-                },
-                Error: new Error()
-              };
+            RE_EXN_ID: Stop,
+            _1: {
+              TAG: "Missing",
+              _0: s
+            },
+            Error: new Error()
+          };
         }
         }(s,follow));
         var consume_arg = (function(follow){
@@ -333,15 +333,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, s$1);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg,
-                          _2: "a boolean"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg,
+                      _2: "a boolean"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set" :
@@ -366,15 +366,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, x);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$2,
-                          _2: "an integer"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$2,
+                      _2: "an integer"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set_int" :
@@ -384,15 +384,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   f._0.contents = x$1;
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$3,
-                          _2: "an integer"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$3,
+                      _2: "an integer"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Float" :
@@ -402,15 +402,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   Curry._1(f._0, x$2);
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$4,
-                          _2: "a float"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$4,
+                      _2: "a float"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Set_float" :
@@ -420,15 +420,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   f._0.contents = x$3;
                 } else {
                   throw {
-                        RE_EXN_ID: Stop,
-                        _1: {
-                          TAG: "Wrong",
-                          _0: s,
-                          _1: arg$5,
-                          _2: "a float"
-                        },
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stop,
+                    _1: {
+                      TAG: "Wrong",
+                      _0: s,
+                      _1: arg$5,
+                      _2: "a float"
+                    },
+                    Error: new Error()
+                  };
                 }
                 return consume_arg();
             case "Tuple" :
@@ -441,15 +441,15 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
                   return consume_arg();
                 }
                 throw {
-                      RE_EXN_ID: Stop,
-                      _1: {
-                        TAG: "Wrong",
-                        _0: s,
-                        _1: arg$6,
-                        _2: "one of: " + make_symlist("", " ", "", symb)
-                      },
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stop,
+                  _1: {
+                    TAG: "Wrong",
+                    _0: s,
+                    _1: arg$6,
+                    _2: "one of: " + make_symlist("", " ", "", symb)
+                  },
+                  Error: new Error()
+                };
             case "Rest" :
                 var f$1 = f._0;
                 while(current.contents < (argv.contents.length - 1 | 0)) {
@@ -460,10 +460,10 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
             case "Expand" :
                 if (!allow_expand) {
                   throw {
-                        RE_EXN_ID: "Invalid_argument",
-                        _1: "Arg.Expand is is only allowed with Arg.parse_and_expand_argv_dynamic",
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: "Invalid_argument",
+                    _1: "Arg.Expand is is only allowed with Arg.parse_and_expand_argv_dynamic",
+                    Error: new Error()
+                  };
                 }
                 var arg$7 = get_arg();
                 var newarg = Curry._1(f._0, arg$7);
@@ -494,9 +494,9 @@ function parse_and_expand_argv_dynamic_aux(allow_expand, current, argv, speclist
       var m = Caml_js_exceptions.internalToOCamlException(raw_m);
       if (m.RE_EXN_ID === Bad) {
         throw convert_error({
-                  TAG: "Message",
-                  _0: m._1
-                });
+              TAG: "Message",
+              _0: m._1
+            });
       }
       if (m.RE_EXN_ID === Stop) {
         throw convert_error(m._1);
@@ -648,13 +648,13 @@ function replace_leading_tab(s) {
     contents: false
   };
   return $$String.map((function (c) {
-                if (c !== 9 || seen.contents) {
-                  return c;
-                } else {
-                  seen.contents = true;
-                  return /* ' ' */32;
-                }
-              }), s);
+          if (c !== 9 || seen.contents) {
+            return c;
+          } else {
+            seen.contents = true;
+            return /* ' ' */32;
+          }
+        }), s);
 }
 
 function align(limitOpt, speclist) {
@@ -663,41 +663,41 @@ function align(limitOpt, speclist) {
   var len = List.fold_left(max_arg_len, 0, completed);
   var len$1 = len < limit ? len : limit;
   return List.map((function (param) {
-                var spec = param[1];
-                var kwd = param[0];
-                if (param[2] === "") {
-                  return param;
-                }
-                if (spec.TAG === "Symbol") {
-                  var msg = param[2];
-                  var cutcol = second_word(msg);
-                  var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0);
-                  return [
-                          kwd,
-                          spec,
-                          "\n" + (spaces + replace_leading_tab(msg))
-                        ];
-                }
-                var msg$1 = param[2];
-                var cutcol$1 = second_word(msg$1);
-                var kwd_len = kwd.length;
-                var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0;
-                if (diff <= 0) {
-                  return [
-                          kwd,
-                          spec,
-                          replace_leading_tab(msg$1)
-                        ];
-                }
-                var spaces$1 = " ".repeat(diff);
-                var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1);
-                var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0);
-                return [
-                        kwd,
-                        spec,
-                        prefix + (spaces$1 + suffix)
-                      ];
-              }), completed);
+          var spec = param[1];
+          var kwd = param[0];
+          if (param[2] === "") {
+            return param;
+          }
+          if (spec.TAG === "Symbol") {
+            var msg = param[2];
+            var cutcol = second_word(msg);
+            var spaces = " ".repeat(Caml.int_max(0, len$1 - cutcol | 0) + 3 | 0);
+            return [
+              kwd,
+              spec,
+              "\n" + (spaces + replace_leading_tab(msg))
+            ];
+          }
+          var msg$1 = param[2];
+          var cutcol$1 = second_word(msg$1);
+          var kwd_len = kwd.length;
+          var diff = (len$1 - kwd_len | 0) - cutcol$1 | 0;
+          if (diff <= 0) {
+            return [
+              kwd,
+              spec,
+              replace_leading_tab(msg$1)
+            ];
+          }
+          var spaces$1 = " ".repeat(diff);
+          var prefix = $$String.sub(replace_leading_tab(msg$1), 0, cutcol$1);
+          var suffix = $$String.sub(msg$1, cutcol$1, msg$1.length - cutcol$1 | 0);
+          return [
+            kwd,
+            spec,
+            prefix + (spaces$1 + suffix)
+          ];
+        }), completed);
 }
 
 exports.parse = parse;
diff --git a/lib/js/array.js b/lib/js/array.js
index a500e2f4155..4226060b286 100644
--- a/lib/js/array.js
+++ b/lib/js/array.js
@@ -16,10 +16,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, Curry._1(f, 0));
   for(var i = 1; i < l; ++i){
@@ -59,10 +59,10 @@ function append(a1, a2) {
 function sub(a, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.sub",
+      Error: new Error()
+    };
   }
   return Caml_array.sub(a, ofs, len);
 }
@@ -70,10 +70,10 @@ function sub(a, ofs, len) {
 function fill(a, ofs, len, v) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.fill",
+      Error: new Error()
+    };
   }
   for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){
     a[i] = v;
@@ -83,10 +83,10 @@ function fill(a, ofs, len, v) {
 function blit(a1, ofs1, a2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (a1.length - len | 0) || ofs2 < 0 || ofs2 > (a2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.blit",
+      Error: new Error()
+    };
   }
   Caml_array.blit(a1, ofs1, a2, ofs2, len);
 }
@@ -100,10 +100,10 @@ function iter(f, a) {
 function iter2(f, a, b) {
   if (a.length !== b.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.iter2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.iter2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
     Curry._2(f, a[i], b[i]);
@@ -127,10 +127,10 @@ function map2(f, a, b) {
   var lb = b.length;
   if (la !== lb) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.map2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.map2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   if (la === 0) {
     return [];
@@ -313,10 +313,10 @@ function sort(cmp, a) {
       return i31;
     }
     throw {
-          RE_EXN_ID: Bottom,
-          _1: i,
-          Error: new Error()
-        };
+      RE_EXN_ID: Bottom,
+      _1: i,
+      Error: new Error()
+    };
   };
   var trickle = function (l, i, e) {
     try {
@@ -365,14 +365,14 @@ function sort(cmp, a) {
       var father = (i - 1 | 0) / 3 | 0;
       if (i === father) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "array.res",
-                321,
-                4
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "array.res",
+            321,
+            4
+          ],
+          Error: new Error()
+        };
       }
       if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) {
         return Caml_array.set(a, i, e);
diff --git a/lib/js/arrayLabels.js b/lib/js/arrayLabels.js
index eddbbc8ae21..538e3b958a9 100644
--- a/lib/js/arrayLabels.js
+++ b/lib/js/arrayLabels.js
@@ -16,10 +16,10 @@ function init(l, f) {
   }
   if (l < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.init",
+      Error: new Error()
+    };
   }
   var res = Caml_array.make(l, Curry._1(f, 0));
   for(var i = 1; i < l; ++i){
@@ -59,10 +59,10 @@ function append(a1, a2) {
 function sub(a, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.sub",
+      Error: new Error()
+    };
   }
   return Caml_array.sub(a, ofs, len);
 }
@@ -70,10 +70,10 @@ function sub(a, ofs, len) {
 function fill(a, ofs, len, v) {
   if (ofs < 0 || len < 0 || ofs > (a.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.fill",
+      Error: new Error()
+    };
   }
   for(var i = ofs ,i_finish = ofs + len | 0; i < i_finish; ++i){
     a[i] = v;
@@ -83,10 +83,10 @@ function fill(a, ofs, len, v) {
 function blit(a1, ofs1, a2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (a1.length - len | 0) || ofs2 < 0 || ofs2 > (a2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.blit",
+      Error: new Error()
+    };
   }
   Caml_array.blit(a1, ofs1, a2, ofs2, len);
 }
@@ -100,10 +100,10 @@ function iter(f, a) {
 function iter2(f, a, b) {
   if (a.length !== b.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.iter2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.iter2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
     Curry._2(f, a[i], b[i]);
@@ -127,10 +127,10 @@ function map2(f, a, b) {
   var lb = b.length;
   if (la !== lb) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.map2: arrays must have the same length",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Array.map2: arrays must have the same length",
+      Error: new Error()
+    };
   }
   if (la === 0) {
     return [];
@@ -313,10 +313,10 @@ function sort(cmp, a) {
       return i31;
     }
     throw {
-          RE_EXN_ID: Bottom,
-          _1: i,
-          Error: new Error()
-        };
+      RE_EXN_ID: Bottom,
+      _1: i,
+      Error: new Error()
+    };
   };
   var trickle = function (l, i, e) {
     try {
@@ -365,14 +365,14 @@ function sort(cmp, a) {
       var father = (i - 1 | 0) / 3 | 0;
       if (i === father) {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "arrayLabels.res",
-                321,
-                4
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "arrayLabels.res",
+            321,
+            4
+          ],
+          Error: new Error()
+        };
       }
       if (Curry._2(cmp, Caml_array.get(a, father), e) >= 0) {
         return Caml_array.set(a, i, e);
diff --git a/lib/js/belt_Array.js b/lib/js/belt_Array.js
index 3573416e00e..4362dc4b69e 100644
--- a/lib/js/belt_Array.js
+++ b/lib/js/belt_Array.js
@@ -15,14 +15,14 @@ function get(arr, i) {
 function getExn(arr, i) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "belt_Array.res",
-            36,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "belt_Array.res",
+        36,
+        2
+      ],
+      Error: new Error()
+    };
   }
   return arr[i];
 }
@@ -39,14 +39,14 @@ function set(arr, i, v) {
 function setExn(arr, i, v) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "belt_Array.res",
-            49,
-            2
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "belt_Array.res",
+        49,
+        2
+      ],
+      Error: new Error()
+    };
   }
   arr[i] = v;
 }
@@ -627,9 +627,9 @@ function partitionU(a, f) {
   a1.length = i;
   a2.length = j;
   return [
-          a1,
-          a2
-        ];
+    a1,
+    a2
+  ];
 }
 
 function partition(a, f) {
@@ -646,9 +646,9 @@ function unzip(a) {
     a2[i] = match[1];
   }
   return [
-          a1,
-          a2
-        ];
+    a1,
+    a2
+  ];
 }
 
 function joinWithU(a, sep, toString) {
diff --git a/lib/js/belt_Id.js b/lib/js/belt_Id.js
index 42b2ff8dd06..6536e3f4b5b 100644
--- a/lib/js/belt_Id.js
+++ b/lib/js/belt_Id.js
@@ -10,21 +10,21 @@ function MakeComparable(M) {
   var cmp = M.cmp;
   var cmp$1 = Curry.__2(cmp);
   return {
-          cmp: cmp$1
-        };
+    cmp: cmp$1
+  };
 }
 
 function comparableU(cmp) {
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function comparable(cmp) {
   var cmp$1 = Curry.__2(cmp);
   return {
-          cmp: cmp$1
-        };
+    cmp: cmp$1
+  };
 }
 
 function MakeHashableU(M) {
@@ -37,25 +37,25 @@ function MakeHashable(M) {
   var eq = M.eq;
   var eq$1 = Curry.__2(eq);
   return {
-          hash: hash$1,
-          eq: eq$1
-        };
+    hash: hash$1,
+    eq: eq$1
+  };
 }
 
 function hashableU(hash, eq) {
   return {
-          hash: hash,
-          eq: eq
-        };
+    hash: hash,
+    eq: eq
+  };
 }
 
 function hashable(hash, eq) {
   var hash$1 = Curry.__1(hash);
   var eq$1 = Curry.__2(eq);
   return {
-          hash: hash$1,
-          eq: eq$1
-        };
+    hash: hash$1,
+    eq: eq$1
+  };
 }
 
 exports.MakeComparableU = MakeComparableU;
diff --git a/lib/js/belt_List.js b/lib/js/belt_List.js
index 59968e901d1..ecf89d068db 100644
--- a/lib/js/belt_List.js
+++ b/lib/js/belt_List.js
@@ -17,9 +17,9 @@ function headExn(x) {
     return x.hd;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function tail(x) {
@@ -34,16 +34,16 @@ function tailExn(x) {
     return x.tl;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function add(xs, x) {
   return {
-          hd: x,
-          tl: xs
-        };
+    hd: x,
+    tl: xs
+  };
 }
 
 function get(x, n) {
@@ -71,9 +71,9 @@ function get(x, n) {
 function getExn(x, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var _x = x;
   var _n = n;
@@ -89,9 +89,9 @@ function getExn(x, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -477,9 +477,9 @@ function splitAt(lst, n) {
   }
   if (n === 0) {
     return [
-            /* [] */0,
-            lst
-          ];
+      /* [] */0,
+      lst
+    ];
   }
   if (!lst) {
     return;
@@ -491,9 +491,9 @@ function splitAt(lst, n) {
   var rest = splitAtAux(n - 1 | 0, lst.tl, cell);
   if (rest !== undefined) {
     return [
-            cell,
-            rest
-          ];
+      cell,
+      rest
+    ];
   }
   
 }
@@ -1189,23 +1189,23 @@ function removeAssoc(xs, x, eq) {
 function setAssocU(xs, x, k, eq) {
   if (!xs) {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: /* [] */0
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: /* [] */0
+    };
   }
   var l = xs.tl;
   var pair = xs.hd;
   if (eq(pair[0], x)) {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: l
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: l
+    };
   }
   var cell = {
     hd: pair,
@@ -1216,12 +1216,12 @@ function setAssocU(xs, x, k, eq) {
     return cell;
   } else {
     return {
-            hd: [
-              x,
-              k
-            ],
-            tl: xs
-          };
+      hd: [
+        x,
+        k
+      ],
+      tl: xs
+    };
   }
 }
 
@@ -1340,9 +1340,9 @@ function keepMap(xs, p) {
 function partitionU(l, p) {
   if (!l) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var h = l.hd;
   var nextX = {
@@ -1357,14 +1357,14 @@ function partitionU(l, p) {
   partitionAux(p, l.tl, nextX, nextY);
   if (b) {
     return [
-            nextX,
-            nextY.tl
-          ];
+      nextX,
+      nextY.tl
+    ];
   } else {
     return [
-            nextX.tl,
-            nextY
-          ];
+      nextX.tl,
+      nextY
+    ];
   }
 }
 
@@ -1375,9 +1375,9 @@ function partition(l, p) {
 function unzip(xs) {
   if (!xs) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = xs.hd;
   var cellX = {
@@ -1390,9 +1390,9 @@ function unzip(xs) {
   };
   splitAux(xs.tl, cellX, cellY);
   return [
-          cellX,
-          cellY
-        ];
+    cellX,
+    cellY
+  ];
 }
 
 function zip(l1, l2) {
diff --git a/lib/js/belt_Map.js b/lib/js/belt_Map.js
index 98e0016cc4e..29b1912b38b 100644
--- a/lib/js/belt_Map.js
+++ b/lib/js/belt_Map.js
@@ -6,9 +6,9 @@ var Belt_MapDict = require("./belt_MapDict.js");
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.fromArray(data, cmp)
+  };
 }
 
 function remove(m, x) {
@@ -19,9 +19,9 @@ function remove(m, x) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
@@ -29,33 +29,33 @@ function removeMany(m, x) {
   var cmp = m.cmp;
   var newData = Belt_MapDict.removeMany(m.data, x, cmp);
   return {
-          cmp: cmp,
-          data: newData
-        };
+    cmp: cmp,
+    data: newData
+  };
 }
 
 function set(m, key, d) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.set(m.data, key, d, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.set(m.data, key, d, cmp)
+  };
 }
 
 function mergeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.mergeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.mergeMany(m.data, e, cmp)
+  };
 }
 
 function updateU(m, key, f) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.updateU(m.data, key, f, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.updateU(m.data, key, f, cmp)
+  };
 }
 
 function update(m, key, f) {
@@ -67,26 +67,26 @@ function split(m, x) {
   var match = Belt_MapDict.split(m.data, x, cmp);
   var match$1 = match[0];
   return [
-          [
-            {
-              cmp: cmp,
-              data: match$1[0]
-            },
-            {
-              cmp: cmp,
-              data: match$1[1]
-            }
-          ],
-          match[1]
-        ];
+    [
+      {
+        cmp: cmp,
+        data: match$1[0]
+      },
+      {
+        cmp: cmp,
+        data: match$1[1]
+      }
+    ],
+    match[1]
+  ];
 }
 
 function mergeU(s1, s2, f) {
   var cmp = s1.cmp;
   return {
-          cmp: cmp,
-          data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp)
-        };
+    cmp: cmp,
+    data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp)
+  };
 }
 
 function merge(s1, s2, f) {
@@ -95,9 +95,9 @@ function merge(s1, s2, f) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(map) {
@@ -146,9 +146,9 @@ function some(m, f) {
 
 function keepU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.keepU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.keepU(m.data, f)
+  };
 }
 
 function keep(m, f) {
@@ -159,15 +159,15 @@ function partitionU(m, p) {
   var cmp = m.cmp;
   var match = Belt_MapDict.partitionU(m.data, p);
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(m, p) {
@@ -176,9 +176,9 @@ function partition(m, p) {
 
 function mapU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.mapU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.mapU(m.data, f)
+  };
 }
 
 function map(m, f) {
@@ -187,9 +187,9 @@ function map(m, f) {
 
 function mapWithKeyU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_MapDict.mapWithKeyU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_MapDict.mapWithKeyU(m.data, f)
+  };
 }
 
 function mapWithKey(m, f) {
@@ -295,15 +295,15 @@ function getData(m) {
 function getId(m) {
   var cmp = m.cmp;
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function packIdData(id, data) {
   return {
-          cmp: id.cmp,
-          data: data
-        };
+    cmp: id.cmp,
+    data: data
+  };
 }
 
 var Int;
diff --git a/lib/js/belt_MapDict.js b/lib/js/belt_MapDict.js
index d04b1413f17..4dabcbc04c0 100644
--- a/lib/js/belt_MapDict.js
+++ b/lib/js/belt_MapDict.js
@@ -148,70 +148,70 @@ function splitAuxPivot(n, x, pres, cmp) {
   if (c === 0) {
     pres.contents = Caml_option.some(d);
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres, cmp);
     return [
-            match[0],
-            Belt_internalAVLtree.join(match[1], v, d, r)
-          ];
+      match[0],
+      Belt_internalAVLtree.join(match[1], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres, cmp);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(n, x, cmp) {
   if (n === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            undefined
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      undefined
+    ];
   }
   var pres = {
     contents: undefined
   };
   var v = splitAuxPivot(n, x, pres, cmp);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function mergeU(s1, s2, f, cmp) {
   if (s1 === undefined) {
     if (s2 !== undefined) {
       return Belt_internalAVLtree.keepMapU(s2, (function (k, v) {
-                    return f(k, undefined, Caml_option.some(v));
-                  }));
+              return f(k, undefined, Caml_option.some(v));
+            }));
     } else {
       return;
     }
   }
   if (s2 === undefined) {
     return Belt_internalAVLtree.keepMapU(s1, (function (k, v) {
-                  return f(k, Caml_option.some(v), undefined);
-                }));
+            return f(k, Caml_option.some(v), undefined);
+          }));
   }
   if (s1.h >= s2.h) {
     var v1 = s1.k;
diff --git a/lib/js/belt_MutableMap.js b/lib/js/belt_MutableMap.js
index 86770aceb97..ee24b978029 100644
--- a/lib/js/belt_MutableMap.js
+++ b/lib/js/belt_MutableMap.js
@@ -142,9 +142,9 @@ function update(t, x, f) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function clear(m) {
@@ -262,9 +262,9 @@ function eq(m1, m2, cmp) {
 
 function mapU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_internalAVLtree.mapU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_internalAVLtree.mapU(m.data, f)
+  };
 }
 
 function map(m, f) {
@@ -273,9 +273,9 @@ function map(m, f) {
 
 function mapWithKeyU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_internalAVLtree.mapWithKeyU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_internalAVLtree.mapWithKeyU(m.data, f)
+  };
 }
 
 function mapWithKey(m, f) {
@@ -305,9 +305,9 @@ function has(m, x) {
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_internalAVLtree.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLtree.fromArray(data, cmp)
+  };
 }
 
 function set(m, e, v) {
diff --git a/lib/js/belt_MutableMapInt.js b/lib/js/belt_MutableMapInt.js
index 1bc41b8211e..c6a2d38e3c9 100644
--- a/lib/js/belt_MutableMapInt.js
+++ b/lib/js/belt_MutableMapInt.js
@@ -7,8 +7,8 @@ var Belt_internalAVLtree = require("./belt_internalAVLtree.js");
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -72,8 +72,8 @@ function forEach(d, f) {
 
 function mapU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapU(d.data, f)
+  };
 }
 
 function map(d, f) {
@@ -82,8 +82,8 @@ function map(d, f) {
 
 function mapWithKeyU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
+  };
 }
 
 function mapWithKey(d, f) {
@@ -277,8 +277,8 @@ function removeMany(d, xs) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalMapInt.fromArray(xs)
-        };
+    data: Belt_internalMapInt.fromArray(xs)
+  };
 }
 
 function cmpU(d0, d1, f) {
diff --git a/lib/js/belt_MutableMapString.js b/lib/js/belt_MutableMapString.js
index 54ac042f638..5d6cab455b1 100644
--- a/lib/js/belt_MutableMapString.js
+++ b/lib/js/belt_MutableMapString.js
@@ -7,8 +7,8 @@ var Belt_internalMapString = require("./belt_internalMapString.js");
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -72,8 +72,8 @@ function forEach(d, f) {
 
 function mapU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapU(d.data, f)
+  };
 }
 
 function map(d, f) {
@@ -82,8 +82,8 @@ function map(d, f) {
 
 function mapWithKeyU(d, f) {
   return {
-          data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
-        };
+    data: Belt_internalAVLtree.mapWithKeyU(d.data, f)
+  };
 }
 
 function mapWithKey(d, f) {
@@ -277,8 +277,8 @@ function removeMany(d, xs) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalMapString.fromArray(xs)
-        };
+    data: Belt_internalMapString.fromArray(xs)
+  };
 }
 
 function cmpU(d0, d1, f) {
diff --git a/lib/js/belt_MutableQueue.js b/lib/js/belt_MutableQueue.js
index 32faa0361bc..87faf275f70 100644
--- a/lib/js/belt_MutableQueue.js
+++ b/lib/js/belt_MutableQueue.js
@@ -5,10 +5,10 @@ var Caml_option = require("./caml_option.js");
 
 function make(param) {
   return {
-          length: 0,
-          first: undefined,
-          last: undefined
-        };
+    length: 0,
+    first: undefined,
+    last: undefined
+  };
 }
 
 function clear(q) {
@@ -56,9 +56,9 @@ function peekExn(q) {
     return v.content;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function pop(q) {
@@ -91,9 +91,9 @@ function popExn(q) {
     }
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function popUndefined(q) {
diff --git a/lib/js/belt_MutableSet.js b/lib/js/belt_MutableSet.js
index 9b9d1403cf9..95802550903 100644
--- a/lib/js/belt_MutableSet.js
+++ b/lib/js/belt_MutableSet.js
@@ -187,9 +187,9 @@ function mergeMany(d, xs) {
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -259,9 +259,9 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs, id) {
   return {
-          cmp: id.cmp,
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    cmp: id.cmp,
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -271,9 +271,9 @@ function checkInvariantInternal(d) {
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromArray(data, cmp)
+  };
 }
 
 function cmp(d0, d1) {
@@ -303,40 +303,40 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                cmp: cmp,
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                cmp: cmp,
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          cmp: cmp,
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          cmp: cmp,
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              cmp: cmp,
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              cmp: cmp,
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        cmp: cmp,
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        cmp: cmp,
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          cmp: d.cmp,
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    cmp: d.cmp,
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -347,15 +347,15 @@ function partitionU(d, p) {
   var cmp = d.cmp;
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -372,15 +372,15 @@ function intersect(a, b) {
   var match$1 = b.data;
   if (match === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   if (match$1 === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(match);
   var sizeb = Belt_internalAVLset.lengthNode(match$1);
@@ -390,16 +390,16 @@ function intersect(a, b) {
   Belt_internalAVLset.fillArray(match$1, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(a, b) {
@@ -408,15 +408,15 @@ function diff(a, b) {
   var match = b.data;
   if (dataa === undefined) {
     return {
-            cmp: cmp,
-            data: undefined
-          };
+      cmp: cmp,
+      data: undefined
+    };
   }
   if (match === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa);
   var sizeb = Belt_internalAVLset.lengthNode(match);
@@ -426,16 +426,16 @@ function diff(a, b) {
   Belt_internalAVLset.fillArray(match, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(a, b) {
@@ -444,15 +444,15 @@ function union(a, b) {
   var datab = b.data;
   if (dataa === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(datab)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(datab)
+    };
   }
   if (datab === undefined) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.copy(dataa)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.copy(dataa)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa);
   var sizeb = Belt_internalAVLset.lengthNode(datab);
@@ -462,16 +462,16 @@ function union(a, b) {
   Belt_internalAVLset.fillArray(datab, sizea, tmp);
   if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) {
     return {
-            cmp: cmp,
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      cmp: cmp,
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp);
   return {
-          cmp: cmp,
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    cmp: cmp,
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -480,9 +480,9 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          cmp: d.cmp,
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    cmp: d.cmp,
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 var Int;
diff --git a/lib/js/belt_MutableSetInt.js b/lib/js/belt_MutableSetInt.js
index 6ff54181692..6db1c502f63 100644
--- a/lib/js/belt_MutableSetInt.js
+++ b/lib/js/belt_MutableSetInt.js
@@ -185,8 +185,8 @@ function mergeMany(d, arr) {
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -256,8 +256,8 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs) {
   return {
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -266,8 +266,8 @@ function checkInvariantInternal(d) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalSetInt.fromArray(xs)
-        };
+    data: Belt_internalSetInt.fromArray(xs)
+  };
 }
 
 function cmp(d0, d1) {
@@ -296,35 +296,35 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -334,13 +334,13 @@ function keep(d, p) {
 function partitionU(d, p) {
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            data: match[0]
-          },
-          {
-            data: match[1]
-          }
-        ];
+    {
+      data: match[0]
+    },
+    {
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -356,13 +356,13 @@ function intersect(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -372,14 +372,14 @@ function intersect(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(dataa, datab) {
@@ -387,13 +387,13 @@ function diff(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -403,14 +403,14 @@ function diff(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(dataa, datab) {
@@ -418,13 +418,13 @@ function union(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(datab$1)
-          };
+      data: Belt_internalAVLset.copy(datab$1)
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -434,14 +434,14 @@ function union(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea]) {
     return {
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -450,8 +450,8 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 exports.make = make;
diff --git a/lib/js/belt_MutableSetString.js b/lib/js/belt_MutableSetString.js
index 3ab85c7080a..b43cfb6df14 100644
--- a/lib/js/belt_MutableSetString.js
+++ b/lib/js/belt_MutableSetString.js
@@ -185,8 +185,8 @@ function mergeMany(d, arr) {
 
 function make(param) {
   return {
-          data: undefined
-        };
+    data: undefined
+  };
 }
 
 function isEmpty(d) {
@@ -256,8 +256,8 @@ function toArray(d) {
 
 function fromSortedArrayUnsafe(xs) {
   return {
-          data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
-        };
+    data: Belt_internalAVLset.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function checkInvariantInternal(d) {
@@ -266,8 +266,8 @@ function checkInvariantInternal(d) {
 
 function fromArray(xs) {
   return {
-          data: Belt_internalSetString.fromArray(xs)
-        };
+    data: Belt_internalSetString.fromArray(xs)
+  };
 }
 
 function cmp(d0, d1) {
@@ -296,35 +296,35 @@ function split(d, key) {
   var len = arr.length;
   if (i >= 0) {
     return [
-            [
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
-              },
-              {
-                data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
-              }
-            ],
-            true
-          ];
+      [
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i)
+        },
+        {
+          data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0)
+        }
+      ],
+      true
+    ];
   }
   var next = (-i | 0) - 1 | 0;
   return [
-          [
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
-            },
-            {
-              data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
-            }
-          ],
-          false
-        ];
+    [
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next)
+      },
+      {
+        data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0)
+      }
+    ],
+    false
+  ];
 }
 
 function keepU(d, p) {
   return {
-          data: Belt_internalAVLset.keepCopyU(d.data, p)
-        };
+    data: Belt_internalAVLset.keepCopyU(d.data, p)
+  };
 }
 
 function keep(d, p) {
@@ -334,13 +334,13 @@ function keep(d, p) {
 function partitionU(d, p) {
   var match = Belt_internalAVLset.partitionCopyU(d.data, p);
   return [
-          {
-            data: match[0]
-          },
-          {
-            data: match[1]
-          }
-        ];
+    {
+      data: match[0]
+    },
+    {
+      data: match[1]
+    }
+  ];
 }
 
 function partition(d, p) {
@@ -356,13 +356,13 @@ function intersect(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -372,14 +372,14 @@ function intersect(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   var tmp2 = new Array(sizea < sizeb ? sizea : sizeb);
   var k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function diff(dataa, datab) {
@@ -387,13 +387,13 @@ function diff(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: undefined
-          };
+      data: undefined
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -403,14 +403,14 @@ function diff(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var tmp2 = new Array(sizea);
   var k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function union(dataa, datab) {
@@ -418,13 +418,13 @@ function union(dataa, datab) {
   var datab$1 = datab.data;
   if (dataa$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(datab$1)
-          };
+      data: Belt_internalAVLset.copy(datab$1)
+    };
   }
   if (datab$1 === undefined) {
     return {
-            data: Belt_internalAVLset.copy(dataa$1)
-          };
+      data: Belt_internalAVLset.copy(dataa$1)
+    };
   }
   var sizea = Belt_internalAVLset.lengthNode(dataa$1);
   var sizeb = Belt_internalAVLset.lengthNode(datab$1);
@@ -434,14 +434,14 @@ function union(dataa, datab) {
   Belt_internalAVLset.fillArray(datab$1, sizea, tmp);
   if (tmp[sizea - 1 | 0] < tmp[sizea]) {
     return {
-            data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
-          };
+      data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize)
+    };
   }
   var tmp2 = new Array(totalSize);
   var k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0);
   return {
-          data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
-        };
+    data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k)
+  };
 }
 
 function has(d, x) {
@@ -450,8 +450,8 @@ function has(d, x) {
 
 function copy(d) {
   return {
-          data: Belt_internalAVLset.copy(d.data)
-        };
+    data: Belt_internalAVLset.copy(d.data)
+  };
 }
 
 exports.make = make;
diff --git a/lib/js/belt_MutableStack.js b/lib/js/belt_MutableStack.js
index bcce699022d..44335f9540c 100644
--- a/lib/js/belt_MutableStack.js
+++ b/lib/js/belt_MutableStack.js
@@ -5,8 +5,8 @@ var Caml_option = require("./caml_option.js");
 
 function make(param) {
   return {
-          root: undefined
-        };
+    root: undefined
+  };
 }
 
 function clear(s) {
@@ -15,8 +15,8 @@ function clear(s) {
 
 function copy(s) {
   return {
-          root: s.root
-        };
+    root: s.root
+  };
 }
 
 function push(s, x) {
diff --git a/lib/js/belt_Option.js b/lib/js/belt_Option.js
index 3b1c01c98fc..072be465b09 100644
--- a/lib/js/belt_Option.js
+++ b/lib/js/belt_Option.js
@@ -30,9 +30,9 @@ function getExn(x) {
     return Caml_option.valFromOption(x);
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function mapWithDefaultU(opt, $$default, f) {
diff --git a/lib/js/belt_Result.js b/lib/js/belt_Result.js
index fbda5c6de2c..beaccf63f95 100644
--- a/lib/js/belt_Result.js
+++ b/lib/js/belt_Result.js
@@ -7,9 +7,9 @@ function getExn(x) {
     return x._0;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 function mapWithDefaultU(opt, $$default, f) {
@@ -27,14 +27,14 @@ function mapWithDefault(opt, $$default, f) {
 function mapU(opt, f) {
   if (opt.TAG === "Ok") {
     return {
-            TAG: "Ok",
-            _0: f(opt._0)
-          };
+      TAG: "Ok",
+      _0: f(opt._0)
+    };
   } else {
     return {
-            TAG: "Error",
-            _0: opt._0
-          };
+      TAG: "Error",
+      _0: opt._0
+    };
   }
 }
 
@@ -47,9 +47,9 @@ function flatMapU(opt, f) {
     return f(opt._0);
   } else {
     return {
-            TAG: "Error",
-            _0: opt._0
-          };
+      TAG: "Error",
+      _0: opt._0
+    };
   }
 }
 
diff --git a/lib/js/belt_Set.js b/lib/js/belt_Set.js
index 50d6fdac0c3..2feaf204d7a 100644
--- a/lib/js/belt_Set.js
+++ b/lib/js/belt_Set.js
@@ -6,9 +6,9 @@ var Belt_SetDict = require("./belt_SetDict.js");
 function fromArray(data, id) {
   var cmp = id.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.fromArray(data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.fromArray(data, cmp)
+  };
 }
 
 function remove(m, e) {
@@ -19,9 +19,9 @@ function remove(m, e) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
@@ -33,50 +33,50 @@ function add(m, e) {
     return m;
   } else {
     return {
-            cmp: cmp,
-            data: newData
-          };
+      cmp: cmp,
+      data: newData
+    };
   }
 }
 
 function mergeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.mergeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.mergeMany(m.data, e, cmp)
+  };
 }
 
 function removeMany(m, e) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.removeMany(m.data, e, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.removeMany(m.data, e, cmp)
+  };
 }
 
 function union(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.union(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.union(m.data, n.data, cmp)
+  };
 }
 
 function intersect(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.intersect(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.intersect(m.data, n.data, cmp)
+  };
 }
 
 function diff(m, n) {
   var cmp = m.cmp;
   return {
-          cmp: cmp,
-          data: Belt_SetDict.diff(m.data, n.data, cmp)
-        };
+    cmp: cmp,
+    data: Belt_SetDict.diff(m.data, n.data, cmp)
+  };
 }
 
 function subset(m, n) {
@@ -89,25 +89,25 @@ function split(m, e) {
   var match = Belt_SetDict.split(m.data, e, cmp);
   var match$1 = match[0];
   return [
-          [
-            {
-              cmp: cmp,
-              data: match$1[0]
-            },
-            {
-              cmp: cmp,
-              data: match$1[1]
-            }
-          ],
-          match[1]
-        ];
+    [
+      {
+        cmp: cmp,
+        data: match$1[0]
+      },
+      {
+        cmp: cmp,
+        data: match$1[1]
+      }
+    ],
+    match[1]
+  ];
 }
 
 function make(id) {
   return {
-          cmp: id.cmp,
-          data: undefined
-        };
+    cmp: id.cmp,
+    data: undefined
+  };
 }
 
 function isEmpty(m) {
@@ -157,9 +157,9 @@ function some(m, f) {
 
 function keepU(m, f) {
   return {
-          cmp: m.cmp,
-          data: Belt_SetDict.keepU(m.data, f)
-        };
+    cmp: m.cmp,
+    data: Belt_SetDict.keepU(m.data, f)
+  };
 }
 
 function keep(m, f) {
@@ -170,15 +170,15 @@ function partitionU(m, f) {
   var match = Belt_SetDict.partitionU(m.data, f);
   var cmp = m.cmp;
   return [
-          {
-            cmp: cmp,
-            data: match[0]
-          },
-          {
-            cmp: cmp,
-            data: match[1]
-          }
-        ];
+    {
+      cmp: cmp,
+      data: match[0]
+    },
+    {
+      cmp: cmp,
+      data: match[1]
+    }
+  ];
 }
 
 function partition(m, f) {
@@ -231,9 +231,9 @@ function has(m, e) {
 
 function fromSortedArrayUnsafe(xs, id) {
   return {
-          cmp: id.cmp,
-          data: Belt_SetDict.fromSortedArrayUnsafe(xs)
-        };
+    cmp: id.cmp,
+    data: Belt_SetDict.fromSortedArrayUnsafe(xs)
+  };
 }
 
 function getData(m) {
@@ -243,15 +243,15 @@ function getData(m) {
 function getId(m) {
   var cmp = m.cmp;
   return {
-          cmp: cmp
-        };
+    cmp: cmp
+  };
 }
 
 function packIdData(id, data) {
   return {
-          cmp: id.cmp,
-          data: data
-        };
+    cmp: id.cmp,
+    data: data
+  };
 }
 
 function checkInvariantInternal(d) {
diff --git a/lib/js/belt_SetDict.js b/lib/js/belt_SetDict.js
index b0f1f56e96b..d69db2c1e3d 100644
--- a/lib/js/belt_SetDict.js
+++ b/lib/js/belt_SetDict.js
@@ -93,34 +93,34 @@ function splitAuxNoPivot(cmp, n, x) {
   var c = cmp(x, v);
   if (c === 0) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(cmp, l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(cmp, r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(cmp, n, x, pres) {
@@ -131,54 +131,54 @@ function splitAuxPivot(cmp, n, x, pres) {
   if (c === 0) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (c < 0) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(cmp, l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(cmp, r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x, cmp) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(cmp, t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2, cmp) {
diff --git a/lib/js/belt_SetInt.js b/lib/js/belt_SetInt.js
index faa5c9cd827..619d0e8487e 100644
--- a/lib/js/belt_SetInt.js
+++ b/lib/js/belt_SetInt.js
@@ -91,34 +91,34 @@ function splitAuxNoPivot(n, x) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(n, x, pres) {
@@ -128,54 +128,54 @@ function splitAuxPivot(n, x, pres) {
   if (x === v) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2) {
diff --git a/lib/js/belt_SetString.js b/lib/js/belt_SetString.js
index fe845b3feee..a33133a201c 100644
--- a/lib/js/belt_SetString.js
+++ b/lib/js/belt_SetString.js
@@ -91,34 +91,34 @@ function splitAuxNoPivot(n, x) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxNoPivot(l, x);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxNoPivot(r, x);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function splitAuxPivot(n, x, pres) {
@@ -128,54 +128,54 @@ function splitAuxPivot(n, x, pres) {
   if (x === v) {
     pres.contents = true;
     return [
-            l,
-            r
-          ];
+      l,
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              n
-            ];
+        undefined,
+        n
+      ];
     }
     var match = splitAuxPivot(l, x, pres);
     return [
-            match[0],
-            Belt_internalAVLset.joinShared(match[1], v, r)
-          ];
+      match[0],
+      Belt_internalAVLset.joinShared(match[1], v, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined
-          ];
+      n,
+      undefined
+    ];
   }
   var match$1 = splitAuxPivot(r, x, pres);
   return [
-          Belt_internalAVLset.joinShared(l, v, match$1[0]),
-          match$1[1]
-        ];
+    Belt_internalAVLset.joinShared(l, v, match$1[0]),
+    match$1[1]
+  ];
 }
 
 function split(t, x) {
   if (t === undefined) {
     return [
-            [
-              undefined,
-              undefined
-            ],
-            false
-          ];
+      [
+        undefined,
+        undefined
+      ],
+      false
+    ];
   }
   var pres = {
     contents: false
   };
   var v = splitAuxPivot(t, x, pres);
   return [
-          v,
-          pres.contents
-        ];
+    v,
+    pres.contents
+  ];
 }
 
 function union(s1, s2) {
diff --git a/lib/js/belt_internalAVLset.js b/lib/js/belt_internalAVLset.js
index f9c4f17aecf..b253dada64b 100644
--- a/lib/js/belt_internalAVLset.js
+++ b/lib/js/belt_internalAVLset.js
@@ -7,11 +7,11 @@ var Belt_SortArray = require("./belt_SortArray.js");
 function copy(n) {
   if (n !== undefined) {
     return {
-            v: n.v,
-            h: n.h,
-            l: copy(n.l),
-            r: copy(n.r)
-          };
+      v: n.v,
+      h: n.h,
+      l: copy(n.l),
+      r: copy(n.r)
+    };
   } else {
     return n;
   }
@@ -21,22 +21,22 @@ function create(l, v, r) {
   var hl = l !== undefined ? l.h : 0;
   var hr = r !== undefined ? r.h : 0;
   return {
-          v: v,
-          h: (
-            hl >= hr ? hl : hr
-          ) + 1 | 0,
-          l: l,
-          r: r
-        };
+    v: v,
+    h: (
+      hl >= hr ? hl : hr
+    ) + 1 | 0,
+    l: l,
+    r: r
+  };
 }
 
 function singleton(x) {
   return {
-          v: x,
-          h: 1,
-          l: undefined,
-          r: undefined
-        };
+    v: x,
+    h: 1,
+    l: undefined,
+    r: undefined
+  };
 }
 
 function heightGe(l, r) {
@@ -65,13 +65,13 @@ function bal(l, v, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            v: v,
-            h: (
-              hl >= hr ? hl : hr
-            ) + 1 | 0,
-            l: l,
-            r: r
-          };
+      v: v,
+      h: (
+        hl >= hr ? hl : hr
+      ) + 1 | 0,
+      l: l,
+      r: r
+    };
   }
   var rl = r.l;
   var rr = r.r;
@@ -291,9 +291,9 @@ function concatShared(t1, t2) {
 function partitionSharedU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var value = n.v;
   var match = partitionSharedU(n.l, p);
@@ -305,14 +305,14 @@ function partitionSharedU(n, p) {
   var rt = match$1[0];
   if (pv) {
     return [
-            joinShared(lt, value, rt),
-            concatShared(lf, rf)
-          ];
+      joinShared(lt, value, rt),
+      concatShared(lf, rf)
+    ];
   } else {
     return [
-            concatShared(lt, rt),
-            joinShared(lf, value, rf)
-          ];
+      concatShared(lt, rt),
+      joinShared(lf, value, rf)
+    ];
   }
 }
 
@@ -371,14 +371,14 @@ function checkInvariantInternal(_v) {
     ) | 0;
     if (!(diff <= 2 && diff >= -2)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "belt_internalAVLset.res",
-              319,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "belt_internalAVLset.res",
+          319,
+          4
+        ],
+        Error: new Error()
+      };
     }
     checkInvariantInternal(l);
     _v = r;
@@ -469,21 +469,21 @@ function fromSortedArrayRevAux(arr, off, len) {
         var x0 = arr[off];
         var x1 = arr[off - 1 | 0];
         return {
-                v: x1,
-                h: 2,
-                l: singleton(x0),
-                r: undefined
-              };
+          v: x1,
+          h: 2,
+          l: singleton(x0),
+          r: undefined
+        };
     case 3 :
         var x0$1 = arr[off];
         var x1$1 = arr[off - 1 | 0];
         var x2 = arr[off - 2 | 0];
         return {
-                v: x1$1,
-                h: 2,
-                l: singleton(x0$1),
-                r: singleton(x2)
-              };
+          v: x1$1,
+          h: 2,
+          l: singleton(x0$1),
+          r: singleton(x2)
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayRevAux(arr, off, nl);
@@ -503,21 +503,21 @@ function fromSortedArrayAux(arr, off, len) {
         var x0 = arr[off];
         var x1 = arr[off + 1 | 0];
         return {
-                v: x1,
-                h: 2,
-                l: singleton(x0),
-                r: undefined
-              };
+          v: x1,
+          h: 2,
+          l: singleton(x0),
+          r: undefined
+        };
     case 3 :
         var x0$1 = arr[off];
         var x1$1 = arr[off + 1 | 0];
         var x2 = arr[off + 2 | 0];
         return {
-                v: x1$1,
-                h: 2,
-                l: singleton(x0$1),
-                r: singleton(x2)
-              };
+          v: x1$1,
+          h: 2,
+          l: singleton(x0$1),
+          r: singleton(x2)
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayAux(arr, off, nl);
@@ -573,9 +573,9 @@ function keepCopy(n, p) {
 function partitionCopyU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var size = lengthNode(n);
   var v = new Array(size);
@@ -587,9 +587,9 @@ function partitionCopyU(n, p) {
   fillArrayWithPartition(n, cursor, v, p);
   var forwardLen = cursor.forward;
   return [
-          fromSortedArrayAux(v, 0, forwardLen),
-          fromSortedArrayRevAux(v, backward, size - forwardLen | 0)
-        ];
+    fromSortedArrayAux(v, 0, forwardLen),
+    fromSortedArrayRevAux(v, backward, size - forwardLen | 0)
+  ];
 }
 
 function partitionCopy(n, p) {
@@ -733,9 +733,9 @@ function getExn(_n, x, cmp) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/js/belt_internalAVLtree.js b/lib/js/belt_internalAVLtree.js
index 13ac5b321e6..b83ebb1bc4a 100644
--- a/lib/js/belt_internalAVLtree.js
+++ b/lib/js/belt_internalAVLtree.js
@@ -15,12 +15,12 @@ function treeHeight(n) {
 function copy(n) {
   if (n !== undefined) {
     return {
-            k: n.k,
-            v: n.v,
-            h: n.h,
-            l: copy(n.l),
-            r: copy(n.r)
-          };
+      k: n.k,
+      v: n.v,
+      h: n.h,
+      l: copy(n.l),
+      r: copy(n.r)
+    };
   } else {
     return n;
   }
@@ -30,22 +30,22 @@ function create(l, x, d, r) {
   var hl = treeHeight(l);
   var hr = treeHeight(r);
   return {
-          k: x,
-          v: d,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
-          l: l,
-          r: r
-        };
+    k: x,
+    v: d,
+    h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
+    l: l,
+    r: r
+  };
 }
 
 function singleton(x, d) {
   return {
-          k: x,
-          v: d,
-          h: 1,
-          l: undefined,
-          r: undefined
-        };
+    k: x,
+    v: d,
+    h: 1,
+    l: undefined,
+    r: undefined
+  };
 }
 
 function heightGe(l, r) {
@@ -65,12 +65,12 @@ function updateValue(n, newValue) {
     return n;
   } else {
     return {
-            k: n.k,
-            v: newValue,
-            h: n.h,
-            l: n.l,
-            r: n.r
-          };
+      k: n.k,
+      v: newValue,
+      h: n.h,
+      l: n.l,
+      r: n.r
+    };
   }
 }
 
@@ -88,12 +88,12 @@ function bal(l, x, d, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return {
-            k: x,
-            v: d,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
-            l: l,
-            r: r
-          };
+      k: x,
+      v: d,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0,
+      l: l,
+      r: r
+    };
   }
   var rl = r.l;
   var rr = r.r;
@@ -162,9 +162,9 @@ function minKV0Aux(_n) {
     var n$1 = n.l;
     if (n$1 === undefined) {
       return [
-              n.k,
-              n.v
-            ];
+        n.k,
+        n.v
+      ];
     }
     _n = n$1;
     continue ;
@@ -191,9 +191,9 @@ function maxKV0Aux(_n) {
     var n$1 = n.r;
     if (n$1 === undefined) {
       return [
-              n.k,
-              n.v
-            ];
+        n.k,
+        n.v
+      ];
     }
     _n = n$1;
     continue ;
@@ -258,9 +258,9 @@ function findFirstByU(n, p) {
   var pvd = p(v, d);
   if (pvd) {
     return [
-            v,
-            d
-          ];
+      v,
+      d
+    ];
   }
   var right = findFirstByU(n.r, p);
   if (right !== undefined) {
@@ -298,12 +298,12 @@ function mapU(n, f) {
   var newD = f(n.v);
   var newRight = mapU(n.r, f);
   return {
-          k: n.k,
-          v: newD,
-          h: n.h,
-          l: newLeft,
-          r: newRight
-        };
+    k: n.k,
+    v: newD,
+    h: n.h,
+    l: newLeft,
+    r: newRight
+  };
 }
 
 function map(n, f) {
@@ -319,12 +319,12 @@ function mapWithKeyU(n, f) {
   var newD = f(key, n.v);
   var newRight = mapWithKeyU(n.r, f);
   return {
-          k: key,
-          v: newD,
-          h: n.h,
-          l: newLeft,
-          r: newRight
-        };
+    k: key,
+    v: newD,
+    h: n.h,
+    l: newLeft,
+    r: newRight
+  };
 }
 
 function mapWithKey(n, f) {
@@ -504,9 +504,9 @@ function keepMap(n, p) {
 function partitionSharedU(n, p) {
   if (n === undefined) {
     return [
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined
+    ];
   }
   var key = n.k;
   var value = n.v;
@@ -519,14 +519,14 @@ function partitionSharedU(n, p) {
   var rt = match$1[0];
   if (pvd) {
     return [
-            join(lt, key, value, rt),
-            concat(lf, rf)
-          ];
+      join(lt, key, value, rt),
+      concat(lf, rf)
+    ];
   } else {
     return [
-            concat(lt, rt),
-            join(lf, key, value, rf)
-          ];
+      concat(lt, rt),
+      join(lf, key, value, rf)
+    ];
   }
 }
 
@@ -588,14 +588,14 @@ function checkInvariantInternal(_v) {
     var diff = treeHeight(l) - treeHeight(r) | 0;
     if (!(diff <= 2 && diff >= -2)) {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "belt_internalAVLtree.res",
-              457,
-              4
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "belt_internalAVLtree.res",
+          457,
+          4
+        ],
+        Error: new Error()
+      };
     }
     checkInvariantInternal(l);
     _v = r;
@@ -705,12 +705,12 @@ function fromSortedArrayRevAux(arr, off, len) {
         var match$1 = match_1;
         var match$2 = match_0;
         return {
-                k: match$1[0],
-                v: match$1[1],
-                h: 2,
-                l: singleton(match$2[0], match$2[1]),
-                r: undefined
-              };
+          k: match$1[0],
+          v: match$1[1],
+          h: 2,
+          l: singleton(match$2[0], match$2[1]),
+          r: undefined
+        };
     case 3 :
         var match_0$1 = arr[off];
         var match_1$1 = arr[off - 1 | 0];
@@ -719,12 +719,12 @@ function fromSortedArrayRevAux(arr, off, len) {
         var match$4 = match_1$1;
         var match$5 = match_0$1;
         return {
-                k: match$4[0],
-                v: match$4[1],
-                h: 2,
-                l: singleton(match$5[0], match$5[1]),
-                r: singleton(match$3[0], match$3[1])
-              };
+          k: match$4[0],
+          v: match$4[1],
+          h: 2,
+          l: singleton(match$5[0], match$5[1]),
+          r: singleton(match$3[0], match$3[1])
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayRevAux(arr, off, nl);
@@ -747,12 +747,12 @@ function fromSortedArrayAux(arr, off, len) {
         var match$1 = match_1;
         var match$2 = match_0;
         return {
-                k: match$1[0],
-                v: match$1[1],
-                h: 2,
-                l: singleton(match$2[0], match$2[1]),
-                r: undefined
-              };
+          k: match$1[0],
+          v: match$1[1],
+          h: 2,
+          l: singleton(match$2[0], match$2[1]),
+          r: undefined
+        };
     case 3 :
         var match_0$1 = arr[off];
         var match_1$1 = arr[off + 1 | 0];
@@ -761,12 +761,12 @@ function fromSortedArrayAux(arr, off, len) {
         var match$4 = match_1$1;
         var match$5 = match_0$1;
         return {
-                k: match$4[0],
-                v: match$4[1],
-                h: 2,
-                l: singleton(match$5[0], match$5[1]),
-                r: singleton(match$3[0], match$3[1])
-              };
+          k: match$4[0],
+          v: match$4[1],
+          h: 2,
+          l: singleton(match$5[0], match$5[1]),
+          r: singleton(match$3[0], match$3[1])
+        };
     default:
       var nl = len / 2 | 0;
       var left = fromSortedArrayAux(arr, off, nl);
@@ -898,9 +898,9 @@ function getExn(_n, x, cmp) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/js/belt_internalBuckets.js b/lib/js/belt_internalBuckets.js
index 40312067bc8..d32d87e893b 100644
--- a/lib/js/belt_internalBuckets.js
+++ b/lib/js/belt_internalBuckets.js
@@ -47,11 +47,11 @@ function copyBuckets(buckets) {
 
 function copy(x) {
   return {
-          size: x.size,
-          buckets: copyBuckets(x.buckets),
-          hash: x.hash,
-          eq: x.eq
-        };
+    size: x.size,
+    buckets: copyBuckets(x.buckets),
+    hash: x.hash,
+    eq: x.eq
+  };
 }
 
 function bucketLength(_accu, _buckets) {
@@ -118,13 +118,13 @@ function reduce(h, init, f) {
 
 function getMaxBucketLength(h) {
   return Belt_Array.reduceU(h.buckets, 0, (function (m, b) {
-                var len = bucketLength(0, b);
-                if (m > len) {
-                  return m;
-                } else {
-                  return len;
-                }
-              }));
+          var len = bucketLength(0, b);
+          if (m > len) {
+            return m;
+          } else {
+            return len;
+          }
+        }));
 }
 
 function getBucketHistogram(h) {
@@ -247,23 +247,23 @@ function linear(h, f) {
 
 function keysToArray(h) {
   return linear(h, (function (x) {
-                return x.key;
-              }));
+          return x.key;
+        }));
 }
 
 function valuesToArray(h) {
   return linear(h, (function (x) {
-                return x.value;
-              }));
+          return x.value;
+        }));
 }
 
 function toArray(h) {
   return linear(h, (function (x) {
-                return [
-                        x.key,
-                        x.value
-                      ];
-              }));
+          return [
+            x.key,
+            x.value
+          ];
+        }));
 }
 
 var C;
diff --git a/lib/js/belt_internalBucketsType.js b/lib/js/belt_internalBucketsType.js
index b1c9b5aa8ce..826a2498167 100644
--- a/lib/js/belt_internalBucketsType.js
+++ b/lib/js/belt_internalBucketsType.js
@@ -18,11 +18,11 @@ function power_2_above(_x, n) {
 function make(hash, eq, hintSize) {
   var s = power_2_above(16, hintSize);
   return {
-          size: 0,
-          buckets: new Array(s),
-          hash: hash,
-          eq: eq
-        };
+    size: 0,
+    buckets: new Array(s),
+    hash: hash,
+    eq: eq
+  };
 }
 
 function clear(h) {
diff --git a/lib/js/belt_internalMapInt.js b/lib/js/belt_internalMapInt.js
index 263dc515d5d..2eb83fc7356 100644
--- a/lib/js/belt_internalMapInt.js
+++ b/lib/js/belt_internalMapInt.js
@@ -64,9 +64,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -137,39 +137,39 @@ function splitAux(x, n) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              undefined,
-              n
-            ];
+        undefined,
+        undefined,
+        n
+      ];
     }
     var match = splitAux(x, l);
     return [
-            match[0],
-            match[1],
-            Belt_internalAVLtree.join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      Belt_internalAVLtree.join(match[2], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined,
-            undefined
-          ];
+      n,
+      undefined,
+      undefined
+    ];
   }
   var match$1 = splitAux(x, r);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function split(x, n) {
@@ -177,10 +177,10 @@ function split(x, n) {
     return splitAux(x, n);
   } else {
     return [
-            undefined,
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined,
+      undefined
+    ];
   }
 }
 
diff --git a/lib/js/belt_internalMapString.js b/lib/js/belt_internalMapString.js
index a466ab1639f..3ea09cad740 100644
--- a/lib/js/belt_internalMapString.js
+++ b/lib/js/belt_internalMapString.js
@@ -64,9 +64,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -137,39 +137,39 @@ function splitAux(x, n) {
   var r = n.r;
   if (x === v) {
     return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
+      l,
+      Caml_option.some(d),
+      r
+    ];
   }
   if (x < v) {
     if (l === undefined) {
       return [
-              undefined,
-              undefined,
-              n
-            ];
+        undefined,
+        undefined,
+        n
+      ];
     }
     var match = splitAux(x, l);
     return [
-            match[0],
-            match[1],
-            Belt_internalAVLtree.join(match[2], v, d, r)
-          ];
+      match[0],
+      match[1],
+      Belt_internalAVLtree.join(match[2], v, d, r)
+    ];
   }
   if (r === undefined) {
     return [
-            n,
-            undefined,
-            undefined
-          ];
+      n,
+      undefined,
+      undefined
+    ];
   }
   var match$1 = splitAux(x, r);
   return [
-          Belt_internalAVLtree.join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
+    Belt_internalAVLtree.join(l, v, d, match$1[0]),
+    match$1[1],
+    match$1[2]
+  ];
 }
 
 function split(x, n) {
@@ -177,10 +177,10 @@ function split(x, n) {
     return splitAux(x, n);
   } else {
     return [
-            undefined,
-            undefined,
-            undefined
-          ];
+      undefined,
+      undefined,
+      undefined
+    ];
   }
 }
 
diff --git a/lib/js/belt_internalSetBuckets.js b/lib/js/belt_internalSetBuckets.js
index ab07a34819b..b397538c1a4 100644
--- a/lib/js/belt_internalSetBuckets.js
+++ b/lib/js/belt_internalSetBuckets.js
@@ -44,11 +44,11 @@ function copyBuckets(buckets) {
 
 function copy(x) {
   return {
-          size: x.size,
-          buckets: copyBuckets(x.buckets),
-          hash: x.hash,
-          eq: x.eq
-        };
+    size: x.size,
+    buckets: copyBuckets(x.buckets),
+    hash: x.hash,
+    eq: x.eq
+  };
 }
 
 function bucketLength(_accu, _buckets) {
@@ -144,13 +144,13 @@ function reduce(h, init, f) {
 
 function getMaxBucketLength(h) {
   return Belt_Array.reduceU(h.buckets, 0, (function (m, b) {
-                var len = bucketLength(0, b);
-                if (m > len) {
-                  return m;
-                } else {
-                  return len;
-                }
-              }));
+          var len = bucketLength(0, b);
+          if (m > len) {
+            return m;
+          } else {
+            return len;
+          }
+        }));
 }
 
 function getBucketHistogram(h) {
diff --git a/lib/js/belt_internalSetInt.js b/lib/js/belt_internalSetInt.js
index e8855a24210..31e7490b148 100644
--- a/lib/js/belt_internalSetInt.js
+++ b/lib/js/belt_internalSetInt.js
@@ -142,9 +142,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/js/belt_internalSetString.js b/lib/js/belt_internalSetString.js
index 3a47cb8cff8..5d25abb44df 100644
--- a/lib/js/belt_internalSetString.js
+++ b/lib/js/belt_internalSetString.js
@@ -142,9 +142,9 @@ function getExn(_n, x) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
diff --git a/lib/js/buffer.js b/lib/js/buffer.js
index 2806ddab756..3c704d7a69e 100644
--- a/lib/js/buffer.js
+++ b/lib/js/buffer.js
@@ -10,11 +10,11 @@ function create(n) {
   var n$1 = n < 1 ? 1 : n;
   var s = Caml_bytes.create(n$1);
   return {
-          buffer: s,
-          position: 0,
-          length: n$1,
-          initial_buffer: s
-        };
+    buffer: s,
+    position: 0,
+    length: n$1,
+    initial_buffer: s
+  };
 }
 
 function contents(b) {
@@ -28,10 +28,10 @@ function to_bytes(b) {
 function sub(b, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (b.position - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.sub",
+      Error: new Error()
+    };
   }
   return Bytes.sub_string(b.buffer, ofs, len);
 }
@@ -39,10 +39,10 @@ function sub(b, ofs, len) {
 function blit(src, srcoff, dst, dstoff, len) {
   if (len < 0 || srcoff < 0 || srcoff > (src.position - len | 0) || dstoff < 0 || dstoff > (dst.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.blit",
+      Error: new Error()
+    };
   }
   Bytes.blit(src.buffer, srcoff, dst, dstoff, len);
 }
@@ -50,10 +50,10 @@ function blit(src, srcoff, dst, dstoff, len) {
 function nth(b, ofs) {
   if (ofs < 0 || ofs >= b.position) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.nth",
+      Error: new Error()
+    };
   }
   return b.buffer[ofs];
 }
@@ -97,14 +97,14 @@ function add_utf_8_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            98,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        98,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 127) {
     return add_char(b, u$1);
@@ -143,28 +143,28 @@ function add_utf_8_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          127,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      127,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_utf_16be_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            132,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        132,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 65535) {
     var pos = b.position;
@@ -192,28 +192,28 @@ function add_utf_16be_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          154,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      154,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_utf_16le_uchar(b, u) {
   var u$1 = u;
   if (u$1 < 0) {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "buffer.res",
-            159,
-            18
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "buffer.res",
+        159,
+        18
+      ],
+      Error: new Error()
+    };
   }
   if (u$1 <= 65535) {
     var pos = b.position;
@@ -241,23 +241,23 @@ function add_utf_16le_uchar(b, u) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          181,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      181,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function add_substring(b, s, offset, len) {
   if (offset < 0 || len < 0 || offset > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.add_substring/add_subbytes",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.add_substring/add_subbytes",
+      Error: new Error()
+    };
   }
   var new_position = b.position + len | 0;
   if (new_position > b.length) {
@@ -297,14 +297,14 @@ function closing(param) {
     return /* '}' */125;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "buffer.res",
-          216,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "buffer.res",
+      216,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 function advance_to_closing(opening, closing, k, s, start) {
@@ -316,9 +316,9 @@ function advance_to_closing(opening, closing, k, s, start) {
     var k$1 = _k;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (Caml_string.get(s, i) === opening) {
       _i = i + 1 | 0;
@@ -373,24 +373,24 @@ function advance_to_non_alpha(s, start) {
 function find_ident(s, start, lim) {
   if (start >= lim) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var c = Caml_string.get(s, start);
   if (c !== 40 && c !== 123) {
     var stop = advance_to_non_alpha(s, start + 1 | 0);
     return [
-            $$String.sub(s, start, stop - start | 0),
-            stop
-          ];
+      $$String.sub(s, start, stop - start | 0),
+      stop
+    ];
   }
   var new_start = start + 1 | 0;
   var stop$1 = advance_to_closing(c, closing(c), 0, s, new_start);
   return [
-          $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0),
-          stop$1 + 1 | 0
-        ];
+    $$String.sub(s, new_start, (stop$1 - start | 0) - 1 | 0),
+    stop$1 + 1 | 0
+  ];
 }
 
 function add_substitute(b, f, s) {
@@ -444,10 +444,10 @@ function add_substitute(b, f, s) {
 function truncate(b, len) {
   if (len < 0 || len > b.position) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Buffer.truncate",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Buffer.truncate",
+      Error: new Error()
+    };
   }
   b.position = len;
 }
diff --git a/lib/js/bytes.js b/lib/js/bytes.js
index 5229566a5b4..0974c146dab 100644
--- a/lib/js/bytes.js
+++ b/lib/js/bytes.js
@@ -112,10 +112,10 @@ function of_string(s) {
 function sub(s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.sub / Bytes.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.sub / Bytes.sub",
+      Error: new Error()
+    };
   }
   var r = Caml_bytes.create(len);
   unsafe_blit(s, ofs, r, 0, len);
@@ -139,20 +139,20 @@ function $plus$plus(a, b) {
       return c;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   if (match$1) {
     return c;
   }
   if (match$2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   return c;
 }
@@ -179,10 +179,10 @@ function extend(s, left, right) {
 function fill(s, ofs, len, c) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.fill / Bytes.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.fill / Bytes.fill",
+      Error: new Error()
+    };
   }
   unsafe_fill(s, ofs, len, c);
 }
@@ -190,10 +190,10 @@ function fill(s, ofs, len, c) {
 function blit(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.blit",
+      Error: new Error()
+    };
   }
   unsafe_blit(s1, ofs1, s2, ofs2, len);
 }
@@ -201,10 +201,10 @@ function blit(s1, ofs1, s2, ofs2, len) {
 function blit_string(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.blit / Bytes.blit_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.blit / Bytes.blit_string",
+      Error: new Error()
+    };
   }
   if (len <= 0) {
     return;
@@ -241,10 +241,10 @@ function ensure_ge(x, y) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Bytes.concat",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Bytes.concat",
+    Error: new Error()
+  };
 }
 
 function sum_lengths(_acc, seplen, _param) {
@@ -486,9 +486,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -524,10 +524,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -536,10 +536,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -549,9 +549,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -568,10 +568,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -597,10 +597,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -609,10 +609,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -634,10 +634,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
diff --git a/lib/js/bytesLabels.js b/lib/js/bytesLabels.js
index 5229566a5b4..0974c146dab 100644
--- a/lib/js/bytesLabels.js
+++ b/lib/js/bytesLabels.js
@@ -112,10 +112,10 @@ function of_string(s) {
 function sub(s, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.sub / Bytes.sub",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.sub / Bytes.sub",
+      Error: new Error()
+    };
   }
   var r = Caml_bytes.create(len);
   unsafe_blit(s, ofs, r, 0, len);
@@ -139,20 +139,20 @@ function $plus$plus(a, b) {
       return c;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   if (match$1) {
     return c;
   }
   if (match$2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.extend",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.extend",
+      Error: new Error()
+    };
   }
   return c;
 }
@@ -179,10 +179,10 @@ function extend(s, left, right) {
 function fill(s, ofs, len, c) {
   if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.fill / Bytes.fill",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.fill / Bytes.fill",
+      Error: new Error()
+    };
   }
   unsafe_fill(s, ofs, len, c);
 }
@@ -190,10 +190,10 @@ function fill(s, ofs, len, c) {
 function blit(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Bytes.blit",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Bytes.blit",
+      Error: new Error()
+    };
   }
   unsafe_blit(s1, ofs1, s2, ofs2, len);
 }
@@ -201,10 +201,10 @@ function blit(s1, ofs1, s2, ofs2, len) {
 function blit_string(s1, ofs1, s2, ofs2, len) {
   if (len < 0 || ofs1 < 0 || ofs1 > (s1.length - len | 0) || ofs2 < 0 || ofs2 > (s2.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.blit / Bytes.blit_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.blit / Bytes.blit_string",
+      Error: new Error()
+    };
   }
   if (len <= 0) {
     return;
@@ -241,10 +241,10 @@ function ensure_ge(x, y) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Bytes.concat",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "Bytes.concat",
+    Error: new Error()
+  };
 }
 
 function sum_lengths(_acc, seplen, _param) {
@@ -486,9 +486,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -524,10 +524,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -536,10 +536,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -549,9 +549,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s[i] === c) {
       return i;
@@ -568,10 +568,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -597,10 +597,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -609,10 +609,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -634,10 +634,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
diff --git a/lib/js/caml_array.js b/lib/js/caml_array.js
index 7fd284b4d2e..343049984a3 100644
--- a/lib/js/caml_array.js
+++ b/lib/js/caml_array.js
@@ -58,10 +58,10 @@ function concat(l) {
 function set(xs, index, newval) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   xs[index] = newval;
 }
@@ -69,10 +69,10 @@ function set(xs, index, newval) {
 function get(xs, index) {
   if (index < 0 || index >= xs.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return xs[index];
 }
diff --git a/lib/js/caml_bigint.js b/lib/js/caml_bigint.js
index c3ecb2a28e6..b6031d5ed0e 100644
--- a/lib/js/caml_bigint.js
+++ b/lib/js/caml_bigint.js
@@ -4,9 +4,9 @@
 function div(x, y) {
   if (y === 0n) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x / y;
 }
@@ -14,9 +14,9 @@ function div(x, y) {
 function mod_(x, y) {
   if (y === 0n) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x % y;
 }
diff --git a/lib/js/caml_bytes.js b/lib/js/caml_bytes.js
index df0f4470f88..9796a181067 100644
--- a/lib/js/caml_bytes.js
+++ b/lib/js/caml_bytes.js
@@ -4,10 +4,10 @@
 function set(s, i, ch) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   s[i] = ch;
 }
@@ -15,10 +15,10 @@ function set(s, i, ch) {
 function get(s, i) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return s[i];
 }
@@ -26,10 +26,10 @@ function get(s, i) {
 function create(len) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.create",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.create",
+      Error: new Error()
+    };
   }
   var result = new Array(len);
   for(var i = 0; i < len; ++i){
diff --git a/lib/js/caml_float.js b/lib/js/caml_float.js
index d0d8fd5e363..bde4822cb48 100644
--- a/lib/js/caml_float.js
+++ b/lib/js/caml_float.js
@@ -13,14 +13,14 @@ function modf_float(x) {
   if (!isFinite(x)) {
     if (isNaN(x)) {
       return [
-              NaN,
-              NaN
-            ];
+        NaN,
+        NaN
+      ];
     } else {
       return [
-              1 / x,
-              x
-            ];
+        1 / x,
+        x
+      ];
     }
   }
   var neg = 1 / x < 0;
@@ -29,14 +29,14 @@ function modf_float(x) {
   var f = x$1 - i;
   if (neg) {
     return [
-            - f,
-            - i
-          ];
+      - f,
+      - i
+    ];
   } else {
     return [
-            f,
-            i
-          ];
+      f,
+      i
+    ];
   }
 }
 
@@ -61,9 +61,9 @@ function ldexp_float(x, exp) {
 function frexp_float(x) {
   if (x === 0 || !isFinite(x)) {
     return [
-            x,
-            0
-          ];
+      x,
+      0
+    ];
   }
   var neg = x < 0;
   var x$p = Math.abs(x);
@@ -77,9 +77,9 @@ function frexp_float(x) {
     x$p = - x$p;
   }
   return [
-          x$p,
-          exp | 0
-        ];
+    x$p,
+    exp | 0
+  ];
 }
 
 function copysign_float(x, y) {
diff --git a/lib/js/caml_format.js b/lib/js/caml_format.js
index bb6e0c34ebf..b6d6dbe95ec 100644
--- a/lib/js/caml_format.js
+++ b/lib/js/caml_format.js
@@ -119,10 +119,10 @@ function parse_sign_and_base(s) {
     }
   }
   return [
-          i,
-          sign,
-          base
-        ];
+    i,
+    sign,
+    base
+  ];
 }
 
 function int_of_string(s) {
@@ -135,10 +135,10 @@ function int_of_string(s) {
   var d = parse_digit(c);
   if (d < 0 || d >= base) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int_of_string",
+      Error: new Error()
+    };
   }
   var aux = function (_acc, _k) {
     while(true) {
@@ -155,18 +155,18 @@ function int_of_string(s) {
       var v = parse_digit(a);
       if (v < 0 || v >= base) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int_of_string",
+          Error: new Error()
+        };
       }
       var acc$1 = base * acc + v;
       if (acc$1 > threshold) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int_of_string",
+          Error: new Error()
+        };
       }
       _k = k + 1 | 0;
       _acc = acc$1;
@@ -177,10 +177,10 @@ function int_of_string(s) {
   var or_res = res | 0;
   if (base === 10 && res !== or_res) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int_of_string",
+      Error: new Error()
+    };
   }
   return or_res;
 }
@@ -221,10 +221,10 @@ function int64_of_string(s) {
   var d = Caml_int64.of_int32(parse_digit(c));
   if (Caml.i64_lt(d, Caml_int64.zero) || Caml.i64_ge(d, base)) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int64_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int64_of_string",
+      Error: new Error()
+    };
   }
   var aux = function (_acc, _k) {
     while(true) {
@@ -241,10 +241,10 @@ function int64_of_string(s) {
       var v = Caml_int64.of_int32(parse_digit(a));
       if (Caml.i64_lt(v, Caml_int64.zero) || Caml.i64_ge(v, base) || Caml.i64_gt(acc, threshold)) {
         throw {
-              RE_EXN_ID: "Failure",
-              _1: "int64_of_string",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Failure",
+          _1: "int64_of_string",
+          Error: new Error()
+        };
       }
       var acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v);
       _k = k + 1 | 0;
@@ -259,10 +259,10 @@ function int64_of_string(s) {
           10
         ]) && Caml.i64_neq(res, or_res)) {
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "int64_of_string",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "int64_of_string",
+      Error: new Error()
+    };
   }
   return or_res;
 }
@@ -291,10 +291,10 @@ function parse_format(fmt) {
   var len = fmt.length;
   if (len > 31) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "format_int: format too long",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "format_int: format too long",
+      Error: new Error()
+    };
   }
   var f = {
     justify: "+",
@@ -786,9 +786,9 @@ var float_of_string = (function(s,exn){
 
 function float_of_string$1(s) {
   return float_of_string(s, {
-              RE_EXN_ID: "Failure",
-              _1: "float_of_string"
-            });
+        RE_EXN_ID: "Failure",
+        _1: "float_of_string"
+      });
 }
 
 exports.format_float = format_float;
diff --git a/lib/js/caml_int32.js b/lib/js/caml_int32.js
index 19085ae3d79..348de87617c 100644
--- a/lib/js/caml_int32.js
+++ b/lib/js/caml_int32.js
@@ -4,9 +4,9 @@
 function div(x, y) {
   if (y === 0) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x / y | 0;
 }
@@ -14,9 +14,9 @@ function div(x, y) {
 function mod_(x, y) {
   if (y === 0) {
     throw {
-          RE_EXN_ID: "Division_by_zero",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Division_by_zero",
+      Error: new Error()
+    };
   }
   return x % y;
 }
diff --git a/lib/js/caml_int64.js b/lib/js/caml_int64.js
index 5a69f07ca08..6deb838e074 100644
--- a/lib/js/caml_int64.js
+++ b/lib/js/caml_int64.js
@@ -4,9 +4,9 @@ var Caml = require("./caml.js");
 
 function mk(lo, hi) {
   return [
-          hi,
-          (lo >>> 0)
-        ];
+    hi,
+    (lo >>> 0)
+  ];
 }
 
 var min_int = [
@@ -47,21 +47,21 @@ function succ(param) {
   var x_hi = param[0];
   var lo = x_lo + 1 | 0;
   return [
-          x_hi + (
-            lo === 0 ? 1 : 0
-          ) | 0,
-          (lo >>> 0)
-        ];
+    x_hi + (
+      lo === 0 ? 1 : 0
+    ) | 0,
+    (lo >>> 0)
+  ];
 }
 
 function neg(param) {
   var other_lo = (param[1] ^ -1) + 1 | 0;
   return [
-          (param[0] ^ -1) + (
-            other_lo === 0 ? 1 : 0
-          ) | 0,
-          (other_lo >>> 0)
-        ];
+    (param[0] ^ -1) + (
+      other_lo === 0 ? 1 : 0
+    ) | 0,
+    (other_lo >>> 0)
+  ];
 }
 
 function add_aux(param, y_lo, y_hi) {
@@ -69,9 +69,9 @@ function add_aux(param, y_lo, y_hi) {
   var lo = x_lo + y_lo | 0;
   var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0;
   return [
-          param[0] + y_hi + overflow | 0,
-          (lo >>> 0)
-        ];
+    param[0] + y_hi + overflow | 0,
+    (lo >>> 0)
+  ];
 }
 
 function add(self, param) {
@@ -129,14 +129,14 @@ function lsl_(x, numBits) {
   var lo = x[1];
   if (numBits >= 32) {
     return [
-            (lo << (numBits - 32 | 0)),
-            0
-          ];
+      (lo << (numBits - 32 | 0)),
+      0
+    ];
   } else {
     return [
-            (lo >>> (32 - numBits | 0)) | (x[0] << numBits),
-            ((lo << numBits) >>> 0)
-          ];
+      (lo >>> (32 - numBits | 0)) | (x[0] << numBits),
+      ((lo << numBits) >>> 0)
+    ];
   }
 }
 
@@ -148,19 +148,19 @@ function lsr_(x, numBits) {
   var offset = numBits - 32 | 0;
   if (offset === 0) {
     return [
-            0,
-            (hi >>> 0)
-          ];
+      0,
+      (hi >>> 0)
+    ];
   } else if (offset > 0) {
     return [
-            0,
-            (hi >>> offset)
-          ];
+      0,
+      (hi >>> offset)
+    ];
   } else {
     return [
-            (hi >>> numBits),
-            (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0)
-          ];
+      (hi >>> numBits),
+      (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0)
+    ];
   }
 }
 
@@ -171,14 +171,14 @@ function asr_(x, numBits) {
   var hi = x[0];
   if (numBits < 32) {
     return [
-            (hi >> numBits),
-            (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0)
-          ];
+      (hi >> numBits),
+      (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0)
+    ];
   } else {
     return [
-            hi >= 0 ? 0 : -1,
-            ((hi >> (numBits - 32 | 0)) >>> 0)
-          ];
+      hi >= 0 ? 0 : -1,
+      ((hi >> (numBits - 32 | 0)) >>> 0)
+    ];
   }
 }
 
@@ -270,9 +270,9 @@ function mul(_this, _other) {
         c32 = c32 & 65535;
         c48 = c48 + (a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48) & 65535;
         return [
-                c32 | (c48 << 16),
-                ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0)
-              ];
+          c32 | (c48 << 16),
+          ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0)
+        ];
       }
       
     }
@@ -286,23 +286,23 @@ function mul(_this, _other) {
 
 function xor(param, param$1) {
   return [
-          param[0] ^ param$1[0],
-          ((param[1] ^ param$1[1]) >>> 0)
-        ];
+    param[0] ^ param$1[0],
+    ((param[1] ^ param$1[1]) >>> 0)
+  ];
 }
 
 function or_(param, param$1) {
   return [
-          param[0] | param$1[0],
-          ((param[1] | param$1[1]) >>> 0)
-        ];
+    param[0] | param$1[0],
+    ((param[1] | param$1[1]) >>> 0)
+  ];
 }
 
 function and_(param, param$1) {
   return [
-          param[0] & param$1[0],
-          ((param[1] & param$1[1]) >>> 0)
-        ];
+    param[0] & param$1[0],
+    ((param[1] & param$1[1]) >>> 0)
+  ];
 }
 
 function to_float(param) {
@@ -325,9 +325,9 @@ function of_float(x) {
   var hi = x / 4294967296 | 0;
   var lo = x % 4294967296 | 0;
   return [
-          hi,
-          (lo >>> 0)
-        ];
+    hi,
+    (lo >>> 0)
+  ];
 }
 
 function isSafeInteger(param) {
@@ -384,9 +384,9 @@ function div(_self, _other) {
       exit$1 = 2;
     } else {
       throw {
-            RE_EXN_ID: "Division_by_zero",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Division_by_zero",
+        Error: new Error()
+      };
     }
     if (exit$1 === 2) {
       if (self_hi !== -2147483648) {
@@ -487,9 +487,9 @@ function mod_(self, other) {
 function div_mod(self, other) {
   var quotient = div(self, other);
   return [
-          quotient,
-          sub(self, mul(quotient, other))
-        ];
+    quotient,
+    sub(self, mul(quotient, other))
+  ];
 }
 
 function compare(self, other) {
@@ -514,9 +514,9 @@ function compare(self, other) {
 
 function of_int32(lo) {
   return [
-          lo < 0 ? -1 : 0,
-          (lo >>> 0)
-        ];
+    lo < 0 ? -1 : 0,
+    (lo >>> 0)
+  ];
 }
 
 function to_int32(x) {
@@ -549,9 +549,9 @@ function to_hex(x) {
 
 function discard_sign(x) {
   return [
-          2147483647 & x[0],
-          x[1]
-        ];
+    2147483647 & x[0],
+    x[1]
+  ];
 }
 
 function float_of_bits(x) {
@@ -561,9 +561,9 @@ function float_of_bits(x) {
 function bits_of_float(x) {
   var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x);
   return [
-          match[1],
-          (match[0] >>> 0)
-        ];
+    match[1],
+    (match[0] >>> 0)
+  ];
 }
 
 exports.mk = mk;
diff --git a/lib/js/caml_js_exceptions.js b/lib/js/caml_js_exceptions.js
index e8a1073354f..10ac31000d0 100644
--- a/lib/js/caml_js_exceptions.js
+++ b/lib/js/caml_js_exceptions.js
@@ -10,9 +10,9 @@ function internalToOCamlException(e) {
     return e;
   } else {
     return {
-            RE_EXN_ID: "JsError",
-            _1: e
-          };
+      RE_EXN_ID: "JsError",
+      _1: e
+    };
   }
 }
 
diff --git a/lib/js/caml_lexer.js b/lib/js/caml_lexer.js
index fd748f0adba..f0b4e2adeef 100644
--- a/lib/js/caml_lexer.js
+++ b/lib/js/caml_lexer.js
@@ -105,9 +105,9 @@ var empty_token_lit = "lexing: empty token";
 
 function lex_engine(tbls, i, buf) {
   return caml_lex_engine_aux(tbls, i, buf, {
-              RE_EXN_ID: "Failure",
-              _1: empty_token_lit
-            });
+        RE_EXN_ID: "Failure",
+        _1: empty_token_lit
+      });
 }
 
 /***********************************************/
@@ -246,9 +246,9 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
 
 function new_lex_engine(tbl, i, buf) {
   return caml_new_lex_engine_aux(tbl, i, buf, {
-              RE_EXN_ID: "Failure",
-              _1: empty_token_lit
-            });
+        RE_EXN_ID: "Failure",
+        _1: empty_token_lit
+      });
 }
 
 exports.lex_engine = lex_engine;
diff --git a/lib/js/caml_module.js b/lib/js/caml_module.js
index da3066a0b92..bb191bbe7e7 100644
--- a/lib/js/caml_module.js
+++ b/lib/js/caml_module.js
@@ -5,10 +5,10 @@ var Caml_obj = require("./caml_obj.js");
 function init_mod(loc, shape) {
   var undef_module = function (param) {
     throw {
-          RE_EXN_ID: "Undefined_recursive_module",
-          _1: loc,
-          Error: new Error()
-        };
+      RE_EXN_ID: "Undefined_recursive_module",
+      _1: loc,
+      Error: new Error()
+    };
   };
   var loop = function (shape, struct_, idx) {
     if (typeof shape !== "object") {
@@ -76,14 +76,14 @@ function update_mod(shape, o, n) {
   };
   if (typeof shape !== "object") {
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "caml_module.res",
-            109,
-            9
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "caml_module.res",
+        109,
+        9
+      ],
+      Error: new Error()
+    };
   }
   if (shape.TAG === "Module") {
     var comps = shape._0;
@@ -95,14 +95,14 @@ function update_mod(shape, o, n) {
     return;
   }
   throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "caml_module.res",
-          109,
-          9
-        ],
-        Error: new Error()
-      };
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "caml_module.res",
+      109,
+      9
+    ],
+    Error: new Error()
+  };
 }
 
 exports.init_mod = init_mod;
diff --git a/lib/js/caml_obj.js b/lib/js/caml_obj.js
index 2cb6e9eb674..dcdee42dec1 100644
--- a/lib/js/caml_obj.js
+++ b/lib/js/caml_obj.js
@@ -56,10 +56,10 @@ function compare(a, b) {
     case "function" :
         if (b_type === "function") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "compare: functional value",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "compare: functional value",
+            Error: new Error()
+          };
         }
         break;
     case "number" :
@@ -138,10 +138,10 @@ function compare(a, b) {
       }
       if (tag_a === 251) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "equal: abstract value",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "equal: abstract value",
+          Error: new Error()
+        };
       }
       if (tag_a !== tag_b) {
         if (tag_a < tag_b) {
@@ -269,10 +269,10 @@ function equal(a, b) {
   var b_type = typeof b;
   if (a_type === "function" || b_type === "function") {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "equal: functional value",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "equal: functional value",
+      Error: new Error()
+    };
   }
   if (b_type === "number" || b_type === "bigint" || b_type === "undefined" || b === null) {
     return false;
@@ -284,10 +284,10 @@ function equal(a, b) {
   }
   if (tag_a === 251) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "equal: abstract value",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "equal: abstract value",
+      Error: new Error()
+    };
   }
   if (tag_a !== tag_b) {
     return false;
diff --git a/lib/js/caml_option.js b/lib/js/caml_option.js
index 39266f82c05..18c4b4c0cd1 100644
--- a/lib/js/caml_option.js
+++ b/lib/js/caml_option.js
@@ -8,12 +8,12 @@ function isNested(x) {
 function some(x) {
   if (x === undefined) {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: 0
+    };
   } else if (x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined) {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0
+    };
   } else {
     return x;
   }
@@ -52,8 +52,8 @@ function valFromOption(x) {
     return;
   } else {
     return {
-            BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0
-          };
+      BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0
+    };
   }
 }
 
diff --git a/lib/js/caml_string.js b/lib/js/caml_string.js
index c9cf6584579..4ddd60890b9 100644
--- a/lib/js/caml_string.js
+++ b/lib/js/caml_string.js
@@ -4,10 +4,10 @@
 function get(s, i) {
   if (i >= s.length || i < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "index out of bounds",
+      Error: new Error()
+    };
   }
   return s.codePointAt(i);
 }
diff --git a/lib/js/caml_sys.js b/lib/js/caml_sys.js
index 31b6d8df1ac..e5935ab0aaf 100644
--- a/lib/js/caml_sys.js
+++ b/lib/js/caml_sys.js
@@ -4,18 +4,18 @@
 function sys_getenv(s) {
   if (typeof process === "undefined" || process.env === undefined) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var x = process.env[s];
   if (x !== undefined) {
     return x;
   }
   throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Not_found",
+    Error: new Error()
+  };
 }
 
 var os_type = (function(_){
@@ -45,21 +45,21 @@ var sys_getcwd = (function(param){
 function sys_get_argv(param) {
   if (typeof process === "undefined") {
     return [
-            "",
-            [""]
-          ];
+      "",
+      [""]
+    ];
   }
   var argv = process.argv;
   if (argv == null) {
     return [
-            "",
-            [""]
-          ];
+      "",
+      [""]
+    ];
   } else {
     return [
-            argv[0],
-            argv
-          ];
+      argv[0],
+      argv
+    ];
   }
 }
 
@@ -72,18 +72,18 @@ function sys_exit(exit_code) {
 
 function sys_is_directory(_s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "sys_is_directory not implemented",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "sys_is_directory not implemented",
+    Error: new Error()
+  };
 }
 
 function sys_file_exists(_s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "sys_file_exists not implemented",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "sys_file_exists not implemented",
+    Error: new Error()
+  };
 }
 
 exports.sys_getenv = sys_getenv;
diff --git a/lib/js/camlinternalLazy.js b/lib/js/camlinternalLazy.js
index 58643ff0c94..93d85e01163 100644
--- a/lib/js/camlinternalLazy.js
+++ b/lib/js/camlinternalLazy.js
@@ -17,9 +17,9 @@ function forward_with_closure(blk, closure) {
 
 function raise_undefined() {
   throw {
-        RE_EXN_ID: Undefined,
-        Error: new Error()
-      };
+    RE_EXN_ID: Undefined,
+    Error: new Error()
+  };
 }
 
 function force(lzv) {
@@ -52,16 +52,16 @@ function force_val(lzv) {
 
 function from_fun(closure) {
   return {
-          LAZY_DONE: false,
-          VAL: closure
-        };
+    LAZY_DONE: false,
+    VAL: closure
+  };
 }
 
 function from_val(value) {
   return {
-          LAZY_DONE: true,
-          VAL: value
-        };
+    LAZY_DONE: true,
+    VAL: value
+  };
 }
 
 exports.Undefined = Undefined;
diff --git a/lib/js/char.js b/lib/js/char.js
index e6dedb9fc43..3ec471ae84b 100644
--- a/lib/js/char.js
+++ b/lib/js/char.js
@@ -5,10 +5,10 @@ var Bytes = require("./bytes.js");
 function chr(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Char.chr",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Char.chr",
+      Error: new Error()
+    };
   }
   return n;
 }
diff --git a/lib/js/complex.js b/lib/js/complex.js
index ce4400a3c19..68df6e9cf43 100644
--- a/lib/js/complex.js
+++ b/lib/js/complex.js
@@ -8,37 +8,37 @@ var one = {
 
 function add(x, y) {
   return {
-          re: x.re + y.re,
-          im: x.im + y.im
-        };
+    re: x.re + y.re,
+    im: x.im + y.im
+  };
 }
 
 function sub(x, y) {
   return {
-          re: x.re - y.re,
-          im: x.im - y.im
-        };
+    re: x.re - y.re,
+    im: x.im - y.im
+  };
 }
 
 function neg(x) {
   return {
-          re: - x.re,
-          im: - x.im
-        };
+    re: - x.re,
+    im: - x.im
+  };
 }
 
 function conj(x) {
   return {
-          re: x.re,
-          im: - x.im
-        };
+    re: x.re,
+    im: - x.im
+  };
 }
 
 function mul(x, y) {
   return {
-          re: x.re * y.re - x.im * y.im,
-          im: x.re * y.im + x.im * y.re
-        };
+    re: x.re * y.re - x.im * y.im,
+    im: x.re * y.im + x.im * y.re
+  };
 }
 
 function div(x, y) {
@@ -46,16 +46,16 @@ function div(x, y) {
     var r = y.im / y.re;
     var d = y.re + r * y.im;
     return {
-            re: (x.re + r * x.im) / d,
-            im: (x.im - r * x.re) / d
-          };
+      re: (x.re + r * x.im) / d,
+      im: (x.im - r * x.re) / d
+    };
   }
   var r$1 = y.re / y.im;
   var d$1 = y.im + r$1 * y.re;
   return {
-          re: (r$1 * x.re + x.im) / d$1,
-          im: (r$1 * x.im - x.re) / d$1
-        };
+    re: (r$1 * x.re + x.im) / d$1,
+    im: (r$1 * x.im - x.re) / d$1
+  };
 }
 
 function inv(x) {
@@ -89,17 +89,17 @@ function arg(x) {
 
 function polar(n, a) {
   return {
-          re: Math.cos(a) * n,
-          im: Math.sin(a) * n
-        };
+    re: Math.cos(a) * n,
+    im: Math.sin(a) * n
+  };
 }
 
 function sqrt(x) {
   if (x.re === 0.0 && x.im === 0.0) {
     return {
-            re: 0.0,
-            im: 0.0
-          };
+      re: 0.0,
+      im: 0.0
+    };
   }
   var r = Math.abs(x.re);
   var i = Math.abs(x.im);
@@ -113,30 +113,30 @@ function sqrt(x) {
   }
   if (x.re >= 0.0) {
     return {
-            re: w,
-            im: 0.5 * x.im / w
-          };
+      re: w,
+      im: 0.5 * x.im / w
+    };
   } else {
     return {
-            re: 0.5 * i / w,
-            im: x.im >= 0.0 ? w : - w
-          };
+      re: 0.5 * i / w,
+      im: x.im >= 0.0 ? w : - w
+    };
   }
 }
 
 function exp(x) {
   var e = Math.exp(x.re);
   return {
-          re: e * Math.cos(x.im),
-          im: e * Math.sin(x.im)
-        };
+    re: e * Math.cos(x.im),
+    im: e * Math.sin(x.im)
+  };
 }
 
 function log(x) {
   return {
-          re: Math.log(norm(x)),
-          im: Math.atan2(x.im, x.re)
-        };
+    re: Math.log(norm(x)),
+    im: Math.atan2(x.im, x.re)
+  };
 }
 
 function pow(x, y) {
diff --git a/lib/js/curry.js b/lib/js/curry.js
index d5bb6425a38..bcca7562752 100644
--- a/lib/js/curry.js
+++ b/lib/js/curry.js
@@ -107,9 +107,9 @@ function _2(o, a0, a1) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1
-                  ]);
+              a0,
+              a1
+            ]);
     }
   }
 }
@@ -133,9 +133,9 @@ function _3(o, a0, a1, a2) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2
-                    ]);
+                a1,
+                a2
+              ]);
       case 2 :
           return app(o(a0, a1), [a2]);
       case 3 :
@@ -158,10 +158,10 @@ function _3(o, a0, a1, a2) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2
-                  ]);
+              a0,
+              a1,
+              a2
+            ]);
     }
   }
 }
@@ -185,15 +185,15 @@ function _4(o, a0, a1, a2, a3) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3
-                    ]);
+                a1,
+                a2,
+                a3
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3
-                    ]);
+                a2,
+                a3
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [a3]);
       case 4 :
@@ -212,11 +212,11 @@ function _4(o, a0, a1, a2, a3) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3
+            ]);
     }
   }
 }
@@ -240,22 +240,22 @@ function _5(o, a0, a1, a2, a3, a4) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4
-                    ]);
+                a2,
+                a3,
+                a4
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4
-                    ]);
+                a3,
+                a4
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [a4]);
       case 5 :
@@ -270,12 +270,12 @@ function _5(o, a0, a1, a2, a3, a4) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4
+            ]);
     }
   }
 }
@@ -299,30 +299,30 @@ function _6(o, a0, a1, a2, a3, a4, a5) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5
-                    ]);
+                a3,
+                a4,
+                a5
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5
-                    ]);
+                a4,
+                a5
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [a5]);
       case 6 :
@@ -333,13 +333,13 @@ function _6(o, a0, a1, a2, a3, a4, a5) {
           };
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5
+            ]);
     }
   }
 }
@@ -363,53 +363,53 @@ function _7(o, a0, a1, a2, a3, a4, a5, a6) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a3,
+                a4,
+                a5,
+                a6
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5,
-                      a6
-                    ]);
+                a4,
+                a5,
+                a6
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [
-                      a5,
-                      a6
-                    ]);
+                a5,
+                a6
+              ]);
       case 6 :
           return app(o(a0, a1, a2, a3, a4, a5), [a6]);
       case 7 :
           return o(a0, a1, a2, a3, a4, a5, a6);
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5,
-                    a6
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5,
+              a6
+            ]);
     }
   }
 }
@@ -433,62 +433,62 @@ function _8(o, a0, a1, a2, a3, a4, a5, a6, a7) {
     switch (arity) {
       case 1 :
           return app(o(a0), [
-                      a1,
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a1,
+                a2,
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 2 :
           return app(o(a0, a1), [
-                      a2,
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a2,
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 3 :
           return app(o(a0, a1, a2), [
-                      a3,
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a3,
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 4 :
           return app(o(a0, a1, a2, a3), [
-                      a4,
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a4,
+                a5,
+                a6,
+                a7
+              ]);
       case 5 :
           return app(o(a0, a1, a2, a3, a4), [
-                      a5,
-                      a6,
-                      a7
-                    ]);
+                a5,
+                a6,
+                a7
+              ]);
       case 6 :
           return app(o(a0, a1, a2, a3, a4, a5), [
-                      a6,
-                      a7
-                    ]);
+                a6,
+                a7
+              ]);
       case 7 :
           return app(o(a0, a1, a2, a3, a4, a5, a6), [a7]);
       default:
         return app(o, [
-                    a0,
-                    a1,
-                    a2,
-                    a3,
-                    a4,
-                    a5,
-                    a6,
-                    a7
-                  ]);
+              a0,
+              a1,
+              a2,
+              a3,
+              a4,
+              a5,
+              a6,
+              a7
+            ]);
     }
   }
 }
diff --git a/lib/js/digest.js b/lib/js/digest.js
index dde299252ef..601ac14a7b7 100644
--- a/lib/js/digest.js
+++ b/lib/js/digest.js
@@ -18,10 +18,10 @@ function bytes(b) {
 function substring(str, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (str.length - len | 0)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.substring",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.substring",
+      Error: new Error()
+    };
   }
   return Caml_md5.md5_string(str, ofs, len);
 }
@@ -32,17 +32,17 @@ function subbytes(b, ofs, len) {
 
 function char_hex(n) {
   return n + (
-          n < 10 ? /* '0' */48 : 87
-        ) | 0;
+    n < 10 ? /* '0' */48 : 87
+  ) | 0;
 }
 
 function to_hex(d) {
   if (d.length !== 16) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.to_hex",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.to_hex",
+      Error: new Error()
+    };
   }
   var result = Caml_bytes.create(32);
   for(var i = 0; i <= 15; ++i){
@@ -56,38 +56,38 @@ function to_hex(d) {
 function from_hex(s) {
   if (s.length !== 32) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Digest.from_hex",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Digest.from_hex",
+      Error: new Error()
+    };
   }
   var digit = function (c) {
     if (c >= 65) {
       if (c >= 97) {
         if (c >= 103) {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Digest.from_hex",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Digest.from_hex",
+            Error: new Error()
+          };
         }
         return (c - /* 'a' */97 | 0) + 10 | 0;
       }
       if (c >= 71) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Digest.from_hex",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Digest.from_hex",
+          Error: new Error()
+        };
       }
       return (c - /* 'A' */65 | 0) + 10 | 0;
     }
     if (c > 57 || c < 48) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Digest.from_hex",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Digest.from_hex",
+        Error: new Error()
+      };
     }
     return c - /* '0' */48 | 0;
   };
diff --git a/lib/js/filename.js b/lib/js/filename.js
index 4ca5a984e61..cf0af8d0691 100644
--- a/lib/js/filename.js
+++ b/lib/js/filename.js
@@ -282,14 +282,14 @@ function has_drive(s) {
 function drive_and_path(s) {
   if (has_drive(s)) {
     return [
-            $$String.sub(s, 0, 2),
-            $$String.sub(s, 2, s.length - 2 | 0)
-          ];
+      $$String.sub(s, 0, 2),
+      $$String.sub(s, 2, s.length - 2 | 0)
+    ];
   } else {
     return [
-            "",
-            s
-          ];
+      "",
+      s
+    ];
   }
 }
 
@@ -382,10 +382,10 @@ function chop_suffix(name, suff) {
   var n = name.length - suff.length | 0;
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Filename.chop_suffix",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Filename.chop_suffix",
+      Error: new Error()
+    };
   }
   return $$String.sub(name, 0, n);
 }
@@ -429,10 +429,10 @@ function chop_extension(name) {
   var l = extension_len(name);
   if (l === 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Filename.chop_extension",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Filename.chop_extension",
+      Error: new Error()
+    };
   }
   return $$String.sub(name, 0, name.length - l | 0);
 }
diff --git a/lib/js/genlex.js b/lib/js/genlex.js
index dd03e598172..e47cffb846c 100644
--- a/lib/js/genlex.js
+++ b/lib/js/genlex.js
@@ -57,9 +57,9 @@ function make_lexer(keywords) {
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.RE_EXN_ID === "Not_found") {
         return {
-                TAG: "Ident",
-                _0: id
-              };
+          TAG: "Ident",
+          _0: id
+        };
       }
       throw exn;
     }
@@ -73,10 +73,10 @@ function make_lexer(keywords) {
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
       if (exn.RE_EXN_ID === "Not_found") {
         throw {
-              RE_EXN_ID: Stream.$$Error,
-              _1: "Illegal character " + s,
-              Error: new Error()
-            };
+          RE_EXN_ID: Stream.$$Error,
+          _1: "Illegal character " + s,
+          Error: new Error()
+        };
       }
       throw exn;
     }
@@ -106,9 +106,9 @@ function make_lexer(keywords) {
                   Stream.junk(strm__);
                   reset_buffer();
                   return {
-                          TAG: "String",
-                          _0: string(strm__)
-                        };
+                    TAG: "String",
+                    _0: string(strm__)
+                  };
               case 39 :
                   Stream.junk(strm__);
                   var c$1;
@@ -119,10 +119,10 @@ function make_lexer(keywords) {
                     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
                     if (exn.RE_EXN_ID === Stream.Failure) {
                       throw {
-                            RE_EXN_ID: Stream.$$Error,
-                            _1: "",
-                            Error: new Error()
-                          };
+                        RE_EXN_ID: Stream.$$Error,
+                        _1: "",
+                        Error: new Error()
+                      };
                     }
                     throw exn;
                   }
@@ -130,22 +130,22 @@ function make_lexer(keywords) {
                   if (match !== undefined) {
                     if (match !== 39) {
                       throw {
-                            RE_EXN_ID: Stream.$$Error,
-                            _1: "",
-                            Error: new Error()
-                          };
+                        RE_EXN_ID: Stream.$$Error,
+                        _1: "",
+                        Error: new Error()
+                      };
                     }
                     Stream.junk(strm__);
                     return {
-                            TAG: "Char",
-                            _0: c$1
-                          };
+                      TAG: "Char",
+                      _0: c$1
+                    };
                   }
                   throw {
-                        RE_EXN_ID: Stream.$$Error,
-                        _1: "",
-                        Error: new Error()
-                      };
+                    RE_EXN_ID: Stream.$$Error,
+                    _1: "",
+                    Error: new Error()
+                  };
               case 40 :
                   Stream.junk(strm__);
                   var match$1 = Stream.peek(strm__);
@@ -412,16 +412,16 @@ function make_lexer(keywords) {
               
             }
             return {
-                    TAG: "Float",
-                    _0: Caml_format.float_of_string(get_string())
-                  };
+              TAG: "Float",
+              _0: Caml_format.float_of_string(get_string())
+            };
           };
         }
       }
       return {
-              TAG: "Int",
-              _0: Caml_format.int_of_string(get_string())
-            };
+        TAG: "Int",
+        _0: Caml_format.int_of_string(get_string())
+      };
     };
   };
   var exponent_part = function (strm__) {
@@ -439,15 +439,15 @@ function make_lexer(keywords) {
       var c = Stream.peek(strm__);
       if (c === undefined) {
         return {
-                TAG: "Float",
-                _0: Caml_format.float_of_string(get_string())
-              };
+          TAG: "Float",
+          _0: Caml_format.float_of_string(get_string())
+        };
       }
       if (c > 57 || c < 48) {
         return {
-                TAG: "Float",
-                _0: Caml_format.float_of_string(get_string())
-              };
+          TAG: "Float",
+          _0: Caml_format.float_of_string(get_string())
+        };
       }
       Stream.junk(strm__);
       store(c);
@@ -473,10 +473,10 @@ function make_lexer(keywords) {
             var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
             if (exn.RE_EXN_ID === Stream.Failure) {
               throw {
-                    RE_EXN_ID: Stream.$$Error,
-                    _1: "",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.$$Error,
+                _1: "",
+                Error: new Error()
+              };
             }
             throw exn;
           }
@@ -487,9 +487,9 @@ function make_lexer(keywords) {
         return get_string();
       }
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     };
   };
   var $$char = function (strm__) {
@@ -507,18 +507,18 @@ function make_lexer(keywords) {
         var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
         if (exn.RE_EXN_ID === Stream.Failure) {
           throw {
-                RE_EXN_ID: Stream.$$Error,
-                _1: "",
-                Error: new Error()
-              };
+            RE_EXN_ID: Stream.$$Error,
+            _1: "",
+            Error: new Error()
+          };
         }
         throw exn;
       }
     } else {
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     }
   };
   var $$escape = function (strm__) {
@@ -546,44 +546,44 @@ function make_lexer(keywords) {
           if (c2 !== undefined) {
             if (c2 > 57 || c2 < 48) {
               throw {
-                    RE_EXN_ID: Stream.$$Error,
-                    _1: "",
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.$$Error,
+                _1: "",
+                Error: new Error()
+              };
             }
             Stream.junk(strm__);
             var c3 = Stream.peek(strm__);
             if (c3 !== undefined) {
               if (c3 > 57 || c3 < 48) {
                 throw {
-                      RE_EXN_ID: Stream.$$Error,
-                      _1: "",
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stream.$$Error,
+                  _1: "",
+                  Error: new Error()
+                };
               }
               Stream.junk(strm__);
               return Char.chr((Math.imul(c1 - 48 | 0, 100) + Math.imul(c2 - 48 | 0, 10) | 0) + (c3 - 48 | 0) | 0);
             }
             throw {
-                  RE_EXN_ID: Stream.$$Error,
-                  _1: "",
-                  Error: new Error()
-                };
+              RE_EXN_ID: Stream.$$Error,
+              _1: "",
+              Error: new Error()
+            };
           }
           throw {
-                RE_EXN_ID: Stream.$$Error,
-                _1: "",
-                Error: new Error()
-              };
+            RE_EXN_ID: Stream.$$Error,
+            _1: "",
+            Error: new Error()
+          };
         }
         Stream.junk(strm__);
         return c1;
       }
     } else {
       throw {
-            RE_EXN_ID: Stream.Failure,
-            Error: new Error()
-          };
+        RE_EXN_ID: Stream.Failure,
+        Error: new Error()
+      };
     }
   };
   var comment = function (strm__) {
@@ -605,9 +605,9 @@ function make_lexer(keywords) {
                 }
               }
               throw {
-                    RE_EXN_ID: Stream.Failure,
-                    Error: new Error()
-                  };
+                RE_EXN_ID: Stream.Failure,
+                Error: new Error()
+              };
           case 42 :
               Stream.junk(strm__);
               while(true) {
@@ -625,9 +625,9 @@ function make_lexer(keywords) {
                   return;
                 }
                 throw {
-                      RE_EXN_ID: Stream.Failure,
-                      Error: new Error()
-                    };
+                  RE_EXN_ID: Stream.Failure,
+                  Error: new Error()
+                };
               };
           default:
             Stream.junk(strm__);
@@ -635,16 +635,16 @@ function make_lexer(keywords) {
         }
       } else {
         throw {
-              RE_EXN_ID: Stream.Failure,
-              Error: new Error()
-            };
+          RE_EXN_ID: Stream.Failure,
+          Error: new Error()
+        };
       }
     };
   };
   return function (input) {
     return Stream.from(function (_count) {
-                return next_token(input);
-              });
+          return next_token(input);
+        });
   };
 }
 
diff --git a/lib/js/hashtbl.js b/lib/js/hashtbl.js
index dd2c4bae321..87e78935d6f 100644
--- a/lib/js/hashtbl.js
+++ b/lib/js/hashtbl.js
@@ -62,11 +62,11 @@ function create(randomOpt, initial_size) {
   var s = power_2_above(16, initial_size);
   var seed = random ? Random.State.bits(CamlinternalLazy.force(prng)) : 0;
   return {
-          size: 0,
-          data: Caml_array.make(s, "Empty"),
-          seed: seed,
-          initial_size: s
-        };
+    size: 0,
+    data: Caml_array.make(s, "Empty"),
+    seed: seed,
+    initial_size: s
+  };
 }
 
 function clear(h) {
@@ -113,14 +113,14 @@ function copy_bucketlist(param) {
       };
       if (typeof prec !== "object") {
         throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "hashtbl.res",
-                110,
-                19
-              ],
-              Error: new Error()
-            };
+          RE_EXN_ID: "Assert_failure",
+          _1: [
+            "hashtbl.res",
+            110,
+            19
+          ],
+          Error: new Error()
+        };
       }
       prec.next = r;
       _param = next;
@@ -140,11 +140,11 @@ function copy_bucketlist(param) {
 
 function copy(h) {
   return {
-          size: h.size,
-          data: $$Array.map(copy_bucketlist, h.data),
-          seed: h.seed,
-          initial_size: h.initial_size
-        };
+    size: h.size,
+    data: $$Array.map(copy_bucketlist, h.data),
+    seed: h.seed,
+    initial_size: h.initial_size
+  };
 }
 
 function length(h) {
@@ -172,11 +172,11 @@ function resize(indexfun, h) {
       var data = param.data;
       var next = param.next;
       var cell = inplace ? param : ({
-            TAG: "Cons",
-            key: key,
-            data: data,
-            next: "Empty"
-          });
+          TAG: "Cons",
+          key: key,
+          data: data,
+          next: "Empty"
+        });
       var nidx = Curry._2(indexfun, h, key);
       var tail = Caml_array.get(ndata_tail, nidx);
       if (typeof tail !== "object") {
@@ -255,9 +255,9 @@ function find(h, key) {
   var match = Caml_array.get(h.data, key_index(h, key));
   if (typeof match !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k1 = match.key;
   var d1 = match.data;
@@ -267,9 +267,9 @@ function find(h, key) {
   }
   if (typeof next1 !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k2 = next1.key;
   var d2 = next1.data;
@@ -279,9 +279,9 @@ function find(h, key) {
   }
   if (typeof next2 !== "object") {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   var k3 = next2.key;
   var d3 = next2.data;
@@ -294,9 +294,9 @@ function find(h, key) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var k = param.key;
       var data = param.data;
@@ -369,9 +369,9 @@ function find_all(h, key) {
       var next = param.next;
       if (Caml_obj.equal(k, key)) {
         return {
-                hd: data,
-                tl: find_in_bucket(next)
-              };
+          hd: data,
+          tl: find_in_bucket(next)
+        };
       }
       _param = next;
       continue ;
@@ -592,11 +592,11 @@ function stats(h) {
           Caml_array.set(histo, l, Caml_array.get(histo, l) + 1 | 0);
         }), h.data);
   return {
-          num_bindings: h.size,
-          num_buckets: h.data.length,
-          max_bucket_length: mbl,
-          bucket_histogram: histo
-        };
+    num_bindings: h.size,
+    num_buckets: h.data.length,
+    max_bucket_length: mbl,
+    bucket_histogram: histo
+  };
 }
 
 function MakeSeeded(H) {
@@ -648,9 +648,9 @@ function MakeSeeded(H) {
     var match = Caml_array.get(h.data, key_index(h, key));
     if (typeof match !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k1 = match.key;
     var d1 = match.data;
@@ -660,9 +660,9 @@ function MakeSeeded(H) {
     }
     if (typeof next1 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k2 = next1.key;
     var d2 = next1.data;
@@ -672,9 +672,9 @@ function MakeSeeded(H) {
     }
     if (typeof next2 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k3 = next2.key;
     var d3 = next2.data;
@@ -687,9 +687,9 @@ function MakeSeeded(H) {
         var param = _param;
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Not_found",
+            Error: new Error()
+          };
         }
         var k = param.key;
         var data = param.data;
@@ -760,9 +760,9 @@ function MakeSeeded(H) {
         var next = param.next;
         if (Curry._2(H.equal, k, key)) {
           return {
-                  hd: d,
-                  tl: find_in_bucket(next)
-                };
+            hd: d,
+            tl: find_in_bucket(next)
+          };
         }
         _param = next;
         continue ;
@@ -823,23 +823,23 @@ function MakeSeeded(H) {
     };
   };
   return {
-          create: create,
-          clear: clear,
-          reset: reset,
-          copy: copy,
-          add: add,
-          remove: remove,
-          find: find,
-          find_opt: find_opt,
-          find_all: find_all,
-          replace: replace,
-          mem: mem,
-          iter: iter,
-          filter_map_inplace: filter_map_inplace,
-          fold: fold,
-          length: length,
-          stats: stats
-        };
+    create: create,
+    clear: clear,
+    reset: reset,
+    copy: copy,
+    add: add,
+    remove: remove,
+    find: find,
+    find_opt: find_opt,
+    find_all: find_all,
+    replace: replace,
+    mem: mem,
+    iter: iter,
+    filter_map_inplace: filter_map_inplace,
+    fold: fold,
+    length: length,
+    stats: stats
+  };
 }
 
 function Make(H) {
@@ -892,9 +892,9 @@ function Make(H) {
     var match = Caml_array.get(h.data, key_index(h, key));
     if (typeof match !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k1 = match.key;
     var d1 = match.data;
@@ -904,9 +904,9 @@ function Make(H) {
     }
     if (typeof next1 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k2 = next1.key;
     var d2 = next1.data;
@@ -916,9 +916,9 @@ function Make(H) {
     }
     if (typeof next2 !== "object") {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k3 = next2.key;
     var d3 = next2.data;
@@ -931,9 +931,9 @@ function Make(H) {
         var param = _param;
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Not_found",
+            Error: new Error()
+          };
         }
         var k = param.key;
         var data = param.data;
@@ -1004,9 +1004,9 @@ function Make(H) {
         var next = param.next;
         if (Curry._2(equal, k, key)) {
           return {
-                  hd: d,
-                  tl: find_in_bucket(next)
-                };
+            hd: d,
+            tl: find_in_bucket(next)
+          };
         }
         _param = next;
         continue ;
@@ -1070,23 +1070,23 @@ function Make(H) {
     return create(false, sz);
   };
   return {
-          create: create$1,
-          clear: clear,
-          reset: reset,
-          copy: copy,
-          add: add,
-          remove: remove,
-          find: find,
-          find_opt: find_opt,
-          find_all: find_all,
-          replace: replace,
-          mem: mem,
-          iter: iter,
-          filter_map_inplace: filter_map_inplace,
-          fold: fold,
-          length: length,
-          stats: stats
-        };
+    create: create$1,
+    clear: clear,
+    reset: reset,
+    copy: copy,
+    add: add,
+    remove: remove,
+    find: find,
+    find_opt: find_opt,
+    find_all: find_all,
+    replace: replace,
+    mem: mem,
+    iter: iter,
+    filter_map_inplace: filter_map_inplace,
+    fold: fold,
+    length: length,
+    stats: stats
+  };
 }
 
 var seeded_hash_param = Caml_hash.hash;
diff --git a/lib/js/hashtblLabels.js b/lib/js/hashtblLabels.js
index f459af15551..bde4c5f647c 100644
--- a/lib/js/hashtblLabels.js
+++ b/lib/js/hashtblLabels.js
@@ -38,23 +38,23 @@ function MakeSeeded(H) {
     return Curry._3(fold, Curry.__3(f), tbl, init);
   };
   return {
-          create: include.create,
-          clear: include.clear,
-          reset: include.reset,
-          copy: include.copy,
-          add: add$1,
-          remove: include.remove,
-          find: include.find,
-          find_opt: include.find_opt,
-          find_all: include.find_all,
-          replace: replace$1,
-          mem: include.mem,
-          iter: iter$1,
-          filter_map_inplace: filter_map_inplace$1,
-          fold: fold$1,
-          length: include.length,
-          stats: include.stats
-        };
+    create: include.create,
+    clear: include.clear,
+    reset: include.reset,
+    copy: include.copy,
+    add: add$1,
+    remove: include.remove,
+    find: include.find,
+    find_opt: include.find_opt,
+    find_all: include.find_all,
+    replace: replace$1,
+    mem: include.mem,
+    iter: iter$1,
+    filter_map_inplace: filter_map_inplace$1,
+    fold: fold$1,
+    length: include.length,
+    stats: include.stats
+  };
 }
 
 function Make(H) {
@@ -88,23 +88,23 @@ function Make(H) {
     return Curry._2(create, false, sz);
   };
   return {
-          create: create$1,
-          clear: include.clear,
-          reset: include.reset,
-          copy: include.copy,
-          add: add$1,
-          remove: include.remove,
-          find: include.find,
-          find_opt: include.find_opt,
-          find_all: include.find_all,
-          replace: replace$1,
-          mem: include.mem,
-          iter: iter$1,
-          filter_map_inplace: filter_map_inplace$1,
-          fold: fold$1,
-          length: include.length,
-          stats: include.stats
-        };
+    create: create$1,
+    clear: include.clear,
+    reset: include.reset,
+    copy: include.copy,
+    add: add$1,
+    remove: include.remove,
+    find: include.find,
+    find_opt: include.find_opt,
+    find_all: include.find_all,
+    replace: replace$1,
+    mem: include.mem,
+    iter: iter$1,
+    filter_map_inplace: filter_map_inplace$1,
+    fold: fold$1,
+    length: include.length,
+    stats: include.stats
+  };
 }
 
 var create = Hashtbl.create;
diff --git a/lib/js/js_array.js b/lib/js/js_array.js
index 3f729d17053..14713ac2052 100644
--- a/lib/js/js_array.js
+++ b/lib/js/js_array.js
@@ -42,10 +42,10 @@ function sortInPlaceWith(arg1, obj) {
 
 function spliceInPlace(pos, remove, add, obj) {
   return Caml_splice_call.spliceObjApply(obj, "splice", [
-              pos,
-              remove,
-              add
-            ]);
+        pos,
+        remove,
+        add
+      ]);
 }
 
 function removeFromInPlace(pos, obj) {
diff --git a/lib/js/js_json.js b/lib/js/js_json.js
index 8d9166a1723..77e1f0b0832 100644
--- a/lib/js/js_json.js
+++ b/lib/js/js_json.js
@@ -7,14 +7,14 @@ function classify(x) {
   var ty = typeof x;
   if (ty === "string") {
     return {
-            TAG: "JSONString",
-            _0: x
-          };
+      TAG: "JSONString",
+      _0: x
+    };
   } else if (ty === "number") {
     return {
-            TAG: "JSONNumber",
-            _0: x
-          };
+      TAG: "JSONNumber",
+      _0: x
+    };
   } else if (ty === "boolean") {
     if (x === true) {
       return "JSONTrue";
@@ -25,14 +25,14 @@ function classify(x) {
     return "JSONNull";
   } else if (Array.isArray(x)) {
     return {
-            TAG: "JSONArray",
-            _0: x
-          };
+      TAG: "JSONArray",
+      _0: x
+    };
   } else {
     return {
-            TAG: "JSONObject",
-            _0: x
-          };
+      TAG: "JSONObject",
+      _0: x
+    };
   }
 }
 
diff --git a/lib/js/js_list.js b/lib/js/js_list.js
index 4a8ba9271c2..31658a3d969 100644
--- a/lib/js/js_list.js
+++ b/lib/js/js_list.js
@@ -20,9 +20,9 @@ function length(l) {
 
 function cons(x, xs) {
   return {
-          hd: x,
-          tl: xs
-        };
+    hd: x,
+    tl: xs
+  };
 }
 
 function isEmpty(x) {
diff --git a/lib/js/js_mapperRt.js b/lib/js/js_mapperRt.js
index d8a0bfeab02..137cb6509d5 100644
--- a/lib/js/js_mapperRt.js
+++ b/lib/js/js_mapperRt.js
@@ -4,9 +4,9 @@
 function raiseWhenNotFound(x) {
   if (x == null) {
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   }
   return x;
 }
@@ -33,9 +33,9 @@ function fromIntAssert(len, xs, $$enum) {
     var i = _i;
     if (i === len) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     var k = xs[i];
     if (k === $$enum) {
diff --git a/lib/js/js_types.js b/lib/js/js_types.js
index 42d38b1d742..3ddbc101eee 100644
--- a/lib/js/js_types.js
+++ b/lib/js/js_types.js
@@ -9,19 +9,19 @@ function classify(x) {
     return "JSNull";
   } else if (ty === "number") {
     return {
-            TAG: "JSNumber",
-            _0: x
-          };
+      TAG: "JSNumber",
+      _0: x
+    };
   } else if (ty === "bigint") {
     return {
-            TAG: "JSBigInt",
-            _0: x
-          };
+      TAG: "JSBigInt",
+      _0: x
+    };
   } else if (ty === "string") {
     return {
-            TAG: "JSString",
-            _0: x
-          };
+      TAG: "JSString",
+      _0: x
+    };
   } else if (ty === "boolean") {
     if (x === true) {
       return "JSTrue";
@@ -30,19 +30,19 @@ function classify(x) {
     }
   } else if (ty === "symbol") {
     return {
-            TAG: "JSSymbol",
-            _0: x
-          };
+      TAG: "JSSymbol",
+      _0: x
+    };
   } else if (ty === "function") {
     return {
-            TAG: "JSFunction",
-            _0: x
-          };
+      TAG: "JSFunction",
+      _0: x
+    };
   } else {
     return {
-            TAG: "JSObject",
-            _0: x
-          };
+      TAG: "JSObject",
+      _0: x
+    };
   }
 }
 
diff --git a/lib/js/jsxPPXReactSupportC.js b/lib/js/jsxPPXReactSupportC.js
index d9016af5c6b..bb4242fb077 100644
--- a/lib/js/jsxPPXReactSupportC.js
+++ b/lib/js/jsxPPXReactSupportC.js
@@ -5,18 +5,18 @@ var Caml_splice_call = require("./caml_splice_call.js");
 
 function createElementWithKey(key, component, props) {
   return React.createElement(component, key !== undefined ? Object.assign({
-                    key: key
-                  }, props) : props);
+              key: key
+            }, props) : props);
 }
 
 function createElementVariadicWithKey(key, component, props, elements) {
   return Caml_splice_call.spliceApply(React.createElement, [
-              component,
-              key !== undefined ? Object.assign({
-                      key: key
-                    }, props) : props,
-              elements
-            ]);
+        component,
+        key !== undefined ? Object.assign({
+                key: key
+              }, props) : props,
+        elements
+      ]);
 }
 
 var Jsx;
diff --git a/lib/js/jsxPPXReactSupportU.js b/lib/js/jsxPPXReactSupportU.js
index d9016af5c6b..bb4242fb077 100644
--- a/lib/js/jsxPPXReactSupportU.js
+++ b/lib/js/jsxPPXReactSupportU.js
@@ -5,18 +5,18 @@ var Caml_splice_call = require("./caml_splice_call.js");
 
 function createElementWithKey(key, component, props) {
   return React.createElement(component, key !== undefined ? Object.assign({
-                    key: key
-                  }, props) : props);
+              key: key
+            }, props) : props);
 }
 
 function createElementVariadicWithKey(key, component, props, elements) {
   return Caml_splice_call.spliceApply(React.createElement, [
-              component,
-              key !== undefined ? Object.assign({
-                      key: key
-                    }, props) : props,
-              elements
-            ]);
+        component,
+        key !== undefined ? Object.assign({
+                key: key
+              }, props) : props,
+        elements
+      ]);
 }
 
 var Jsx;
diff --git a/lib/js/lazy.js b/lib/js/lazy.js
index ffcd9a78b37..38e71a131f0 100644
--- a/lib/js/lazy.js
+++ b/lib/js/lazy.js
@@ -5,8 +5,8 @@ var CamlinternalLazy = require("./camlinternalLazy.js");
 
 function from_fun(f) {
   return CamlinternalLazy.from_fun(function () {
-              return Curry._1(f, undefined);
-            });
+        return Curry._1(f, undefined);
+      });
 }
 
 var from_val = CamlinternalLazy.from_val;
diff --git a/lib/js/lexing.js b/lib/js/lexing.js
index 2b9b7f75b67..b45b8675daf 100644
--- a/lib/js/lexing.js
+++ b/lib/js/lexing.js
@@ -46,74 +46,74 @@ var zero_pos = {
 function from_function(f) {
   var partial_arg = Caml_bytes.create(512);
   return {
-          refill_buff: (function (param) {
-              var read = Curry._2(f, partial_arg, partial_arg.length);
-              var n = read > 0 ? read : (param.lex_eof_reached = true, 0);
-              if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) {
-                if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) {
-                  Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0);
-                } else {
-                  var newlen = (param.lex_buffer.length << 1);
-                  if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) {
-                    throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Lexing.lex_refill: cannot grow buffer",
-                          Error: new Error()
-                        };
-                  }
-                  var newbuf = Caml_bytes.create(newlen);
-                  Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0);
-                  param.lex_buffer = newbuf;
-                }
-                var s = param.lex_start_pos;
-                param.lex_abs_pos = param.lex_abs_pos + s | 0;
-                param.lex_curr_pos = param.lex_curr_pos - s | 0;
-                param.lex_start_pos = 0;
-                param.lex_last_pos = param.lex_last_pos - s | 0;
-                param.lex_buffer_len = param.lex_buffer_len - s | 0;
-                var t = param.lex_mem;
-                for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){
-                  var v = Caml_array.get(t, i);
-                  if (v >= 0) {
-                    Caml_array.set(t, i, v - s | 0);
-                  }
-                  
-                }
-              }
-              Bytes.blit(partial_arg, 0, param.lex_buffer, param.lex_buffer_len, n);
-              param.lex_buffer_len = param.lex_buffer_len + n | 0;
-            }),
-          lex_buffer: Caml_bytes.create(1024),
-          lex_buffer_len: 0,
-          lex_abs_pos: 0,
-          lex_start_pos: 0,
-          lex_curr_pos: 0,
-          lex_last_pos: 0,
-          lex_last_action: 0,
-          lex_eof_reached: false,
-          lex_mem: [],
-          lex_start_p: zero_pos,
-          lex_curr_p: zero_pos
-        };
+    refill_buff: (function (param) {
+        var read = Curry._2(f, partial_arg, partial_arg.length);
+        var n = read > 0 ? read : (param.lex_eof_reached = true, 0);
+        if ((param.lex_buffer_len + n | 0) > param.lex_buffer.length) {
+          if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) <= param.lex_buffer.length) {
+            Bytes.blit(param.lex_buffer, param.lex_start_pos, param.lex_buffer, 0, param.lex_buffer_len - param.lex_start_pos | 0);
+          } else {
+            var newlen = (param.lex_buffer.length << 1);
+            if (((param.lex_buffer_len - param.lex_start_pos | 0) + n | 0) > newlen) {
+              throw {
+                RE_EXN_ID: "Failure",
+                _1: "Lexing.lex_refill: cannot grow buffer",
+                Error: new Error()
+              };
+            }
+            var newbuf = Caml_bytes.create(newlen);
+            Bytes.blit(param.lex_buffer, param.lex_start_pos, newbuf, 0, param.lex_buffer_len - param.lex_start_pos | 0);
+            param.lex_buffer = newbuf;
+          }
+          var s = param.lex_start_pos;
+          param.lex_abs_pos = param.lex_abs_pos + s | 0;
+          param.lex_curr_pos = param.lex_curr_pos - s | 0;
+          param.lex_start_pos = 0;
+          param.lex_last_pos = param.lex_last_pos - s | 0;
+          param.lex_buffer_len = param.lex_buffer_len - s | 0;
+          var t = param.lex_mem;
+          for(var i = 0 ,i_finish = t.length; i < i_finish; ++i){
+            var v = Caml_array.get(t, i);
+            if (v >= 0) {
+              Caml_array.set(t, i, v - s | 0);
+            }
+            
+          }
+        }
+        Bytes.blit(partial_arg, 0, param.lex_buffer, param.lex_buffer_len, n);
+        param.lex_buffer_len = param.lex_buffer_len + n | 0;
+      }),
+    lex_buffer: Caml_bytes.create(1024),
+    lex_buffer_len: 0,
+    lex_abs_pos: 0,
+    lex_start_pos: 0,
+    lex_curr_pos: 0,
+    lex_last_pos: 0,
+    lex_last_action: 0,
+    lex_eof_reached: false,
+    lex_mem: [],
+    lex_start_p: zero_pos,
+    lex_curr_p: zero_pos
+  };
 }
 
 function from_string(s) {
   return {
-          refill_buff: (function (lexbuf) {
-              lexbuf.lex_eof_reached = true;
-            }),
-          lex_buffer: Bytes.of_string(s),
-          lex_buffer_len: s.length,
-          lex_abs_pos: 0,
-          lex_start_pos: 0,
-          lex_curr_pos: 0,
-          lex_last_pos: 0,
-          lex_last_action: 0,
-          lex_eof_reached: true,
-          lex_mem: [],
-          lex_start_p: zero_pos,
-          lex_curr_p: zero_pos
-        };
+    refill_buff: (function (lexbuf) {
+        lexbuf.lex_eof_reached = true;
+      }),
+    lex_buffer: Bytes.of_string(s),
+    lex_buffer_len: s.length,
+    lex_abs_pos: 0,
+    lex_start_pos: 0,
+    lex_curr_pos: 0,
+    lex_last_pos: 0,
+    lex_last_action: 0,
+    lex_eof_reached: true,
+    lex_mem: [],
+    lex_start_p: zero_pos,
+    lex_curr_p: zero_pos
+  };
 }
 
 function lexeme(lexbuf) {
diff --git a/lib/js/list.js b/lib/js/list.js
index bc818d61f72..6e8070897cf 100644
--- a/lib/js/list.js
+++ b/lib/js/list.js
@@ -22,9 +22,9 @@ function length(l) {
 
 function cons(a, l) {
   return {
-          hd: a,
-          tl: l
-        };
+    hd: a,
+    tl: l
+  };
 }
 
 function hd(param) {
@@ -32,10 +32,10 @@ function hd(param) {
     return param.hd;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "hd",
+    Error: new Error()
+  };
 }
 
 function tl(param) {
@@ -43,19 +43,19 @@ function tl(param) {
     return param.tl;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "tl",
+    Error: new Error()
+  };
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -71,20 +71,20 @@ function nth(l, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "nth",
+      Error: new Error()
+    };
   };
 }
 
 function nth_opt(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -145,18 +145,18 @@ function init_aux(i, n, f) {
   }
   var r = Curry._1(f, i);
   return {
-          hd: r,
-          tl: init_aux(i + 1 | 0, n, f)
-        };
+    hd: r,
+    tl: init_aux(i + 1 | 0, n, f)
+  };
 }
 
 function init(len, f) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.init",
+      Error: new Error()
+    };
   }
   if (len > 10000) {
     return rev_append(init_tailrec_aux(/* [] */0, 0, len, f), /* [] */0);
@@ -179,9 +179,9 @@ function map(f, param) {
   }
   var r = Curry._1(f, param.hd);
   return {
-          hd: r,
-          tl: map(f, param.tl)
-        };
+    hd: r,
+    tl: map(f, param.tl)
+  };
 }
 
 function mapi(i, f, param) {
@@ -190,9 +190,9 @@ function mapi(i, f, param) {
   }
   var r = Curry._2(f, i, param.hd);
   return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, param.tl)
-        };
+    hd: r,
+    tl: mapi(i + 1 | 0, f, param.tl)
+  };
 }
 
 function mapi$1(f, l) {
@@ -271,24 +271,24 @@ function map2(f, l1, l2) {
     if (l2) {
       var r = Curry._2(f, l1.hd, l2.hd);
       return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
+        hd: r,
+        tl: map2(f, l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2",
+    Error: new Error()
+  };
 }
 
 function rev_map2(f, l1, l2) {
@@ -310,17 +310,17 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     if (l2$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -338,19 +338,19 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.iter2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.iter2",
+      Error: new Error()
+    };
   };
 }
 
@@ -367,17 +367,17 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     if (l2) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -389,17 +389,17 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -446,19 +446,19 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.for_all2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return true;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.for_all2",
+      Error: new Error()
+    };
   };
 }
 
@@ -476,19 +476,19 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.exists2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return false;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.exists2",
+      Error: new Error()
+    };
   };
 }
 
@@ -532,9 +532,9 @@ function assoc(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -565,9 +565,9 @@ function assq(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -624,9 +624,9 @@ function remove_assoc(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -640,9 +640,9 @@ function remove_assq(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -658,9 +658,9 @@ function find(p, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -715,9 +715,9 @@ function partition(p, l) {
     var yes = _yes;
     if (!param) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     var l$1 = param.tl;
     var x = param.hd;
@@ -741,49 +741,49 @@ function partition(p, l) {
 function split(param) {
   if (!param) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = param.hd;
   var match$1 = split(param.tl);
   return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
+    {
+      hd: match[0],
+      tl: match$1[0]
+    },
+    {
+      hd: match[1],
+      tl: match$1[1]
+    }
+  ];
 }
 
 function combine(l1, l2) {
   if (l1) {
     if (l2) {
       return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
+        hd: [
+          l1.hd,
+          l2.hd
+        ],
+        tl: combine(l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.combine",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.combine",
+    Error: new Error()
+  };
 }
 
 function merge(cmp, l1, l2) {
@@ -797,14 +797,14 @@ function merge(cmp, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(cmp, h1, h2) <= 0) {
     return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(cmp, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(cmp, l1, l2.tl)
+    };
   }
 }
 
@@ -821,14 +821,14 @@ function chop(_k, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "list.res",
-            420,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "list.res",
+        420,
+        11
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -846,71 +846,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) <= 0) {
               if (Curry._2(cmp, x2, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -925,20 +925,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) <= 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -992,71 +992,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) > 0) {
               if (Curry._2(cmp, x2, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1071,20 +1071,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1149,136 +1149,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 < 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c < 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1294,25 +1294,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 < 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1380,136 +1380,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 > 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c > 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1525,25 +1525,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
diff --git a/lib/js/listLabels.js b/lib/js/listLabels.js
index 606ee2773a7..318f19b207e 100644
--- a/lib/js/listLabels.js
+++ b/lib/js/listLabels.js
@@ -22,9 +22,9 @@ function length(l) {
 
 function cons(a, l) {
   return {
-          hd: a,
-          tl: l
-        };
+    hd: a,
+    tl: l
+  };
 }
 
 function hd(param) {
@@ -32,10 +32,10 @@ function hd(param) {
     return param.hd;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "hd",
+    Error: new Error()
+  };
 }
 
 function tl(param) {
@@ -43,19 +43,19 @@ function tl(param) {
     return param.tl;
   }
   throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: "tl",
+    Error: new Error()
+  };
 }
 
 function nth(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -71,20 +71,20 @@ function nth(l, n) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Failure",
+      _1: "nth",
+      Error: new Error()
+    };
   };
 }
 
 function nth_opt(l, n) {
   if (n < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.nth",
+      Error: new Error()
+    };
   }
   var _l = l;
   var _n = n;
@@ -145,18 +145,18 @@ function init_aux(i, n, f) {
   }
   var r = Curry._1(f, i);
   return {
-          hd: r,
-          tl: init_aux(i + 1 | 0, n, f)
-        };
+    hd: r,
+    tl: init_aux(i + 1 | 0, n, f)
+  };
 }
 
 function init(len, f) {
   if (len < 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.init",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.init",
+      Error: new Error()
+    };
   }
   if (len > 10000) {
     return rev_append(init_tailrec_aux(/* [] */0, 0, len, f), /* [] */0);
@@ -179,9 +179,9 @@ function map(f, param) {
   }
   var r = Curry._1(f, param.hd);
   return {
-          hd: r,
-          tl: map(f, param.tl)
-        };
+    hd: r,
+    tl: map(f, param.tl)
+  };
 }
 
 function mapi(i, f, param) {
@@ -190,9 +190,9 @@ function mapi(i, f, param) {
   }
   var r = Curry._2(f, i, param.hd);
   return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, param.tl)
-        };
+    hd: r,
+    tl: mapi(i + 1 | 0, f, param.tl)
+  };
 }
 
 function mapi$1(f, l) {
@@ -271,24 +271,24 @@ function map2(f, l1, l2) {
     if (l2) {
       var r = Curry._2(f, l1.hd, l2.hd);
       return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
+        hd: r,
+        tl: map2(f, l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.map2",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.map2",
+    Error: new Error()
+  };
 }
 
 function rev_map2(f, l1, l2) {
@@ -310,17 +310,17 @@ function rev_map2(f, l1, l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     if (l2$1) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.rev_map2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -338,19 +338,19 @@ function iter2(f, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.iter2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.iter2",
+      Error: new Error()
+    };
   };
 }
 
@@ -367,17 +367,17 @@ function fold_left2(f, _accu, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     if (l2) {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.fold_left2",
+        Error: new Error()
+      };
     }
     return accu;
   };
@@ -389,17 +389,17 @@ function fold_right2(f, l1, l2, accu) {
       return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   if (l2) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.fold_right2",
+      Error: new Error()
+    };
   }
   return accu;
 }
@@ -446,19 +446,19 @@ function for_all2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.for_all2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return true;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.for_all2",
+      Error: new Error()
+    };
   };
 }
 
@@ -476,19 +476,19 @@ function exists2(p, _l1, _l2) {
         continue ;
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "List.exists2",
+        Error: new Error()
+      };
     }
     if (!l2) {
       return false;
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.exists2",
+      Error: new Error()
+    };
   };
 }
 
@@ -532,9 +532,9 @@ function assoc(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -565,9 +565,9 @@ function assq(x, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -624,9 +624,9 @@ function remove_assoc(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
+      hd: pair,
+      tl: remove_assoc(x, l)
+    };
   }
 }
 
@@ -640,9 +640,9 @@ function remove_assq(x, param) {
     return l;
   } else {
     return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
+      hd: pair,
+      tl: remove_assq(x, l)
+    };
   }
 }
 
@@ -658,9 +658,9 @@ function find(p, _param) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Not_found",
+      Error: new Error()
+    };
   };
 }
 
@@ -715,9 +715,9 @@ function partition(p, l) {
     var yes = _yes;
     if (!param) {
       return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
+        rev_append(yes, /* [] */0),
+        rev_append(no, /* [] */0)
+      ];
     }
     var l$1 = param.tl;
     var x = param.hd;
@@ -741,49 +741,49 @@ function partition(p, l) {
 function split(param) {
   if (!param) {
     return [
-            /* [] */0,
-            /* [] */0
-          ];
+      /* [] */0,
+      /* [] */0
+    ];
   }
   var match = param.hd;
   var match$1 = split(param.tl);
   return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
+    {
+      hd: match[0],
+      tl: match$1[0]
+    },
+    {
+      hd: match[1],
+      tl: match$1[1]
+    }
+  ];
 }
 
 function combine(l1, l2) {
   if (l1) {
     if (l2) {
       return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
+        hd: [
+          l1.hd,
+          l2.hd
+        ],
+        tl: combine(l1.tl, l2.tl)
+      };
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "List.combine",
+      Error: new Error()
+    };
   }
   if (!l2) {
     return /* [] */0;
   }
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: "List.combine",
+    Error: new Error()
+  };
 }
 
 function merge(cmp, l1, l2) {
@@ -797,14 +797,14 @@ function merge(cmp, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(cmp, h1, h2) <= 0) {
     return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(cmp, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(cmp, l1, l2.tl)
+    };
   }
 }
 
@@ -821,14 +821,14 @@ function chop(_k, _l) {
       continue ;
     }
     throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "listLabels.res",
-            420,
-            11
-          ],
-          Error: new Error()
-        };
+      RE_EXN_ID: "Assert_failure",
+      _1: [
+        "listLabels.res",
+        420,
+        11
+      ],
+      Error: new Error()
+    };
   };
 }
 
@@ -846,71 +846,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) <= 0) {
               if (Curry._2(cmp, x2, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) <= 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) <= 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -925,20 +925,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) <= 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -992,71 +992,71 @@ function stable_sort(cmp, l) {
             if (Curry._2(cmp, x1, x2) > 0) {
               if (Curry._2(cmp, x2, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else if (Curry._2(cmp, x1, x3) > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             } else if (Curry._2(cmp, x1, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else if (Curry._2(cmp, x2, x3) > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1071,20 +1071,20 @@ function stable_sort(cmp, l) {
         var x1$1 = l.hd;
         if (Curry._2(cmp, x1$1, x2$1) > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1149,136 +1149,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 < 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c < 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 < 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 < 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1294,25 +1294,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 < 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
@@ -1380,136 +1380,136 @@ function sort_uniq(cmp, l) {
               var c$1 = Curry._2(cmp, x2, x3);
               if (c$1 === 0) {
                 return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
+                  hd: x2,
+                  tl: /* [] */0
+                };
               } else if (c$1 > 0) {
                 return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x2,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
             }
             if (c > 0) {
               var c$2 = Curry._2(cmp, x2, x3);
               if (c$2 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               }
               if (c$2 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: {
+                      hd: x3,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
               var c$3 = Curry._2(cmp, x1, x3);
               if (c$3 === 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x2,
+                    tl: /* [] */0
+                  }
+                };
               } else if (c$3 > 0) {
                 return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               } else {
                 return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: {
+                      hd: x2,
+                      tl: /* [] */0
+                    }
+                  }
+                };
               }
             }
             var c$4 = Curry._2(cmp, x1, x3);
             if (c$4 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             }
             if (c$4 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: {
+                    hd: x3,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
             var c$5 = Curry._2(cmp, x2, x3);
             if (c$5 === 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x1,
+                  tl: /* [] */0
+                }
+              };
             } else if (c$5 > 0) {
               return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x2,
+                tl: {
+                  hd: x3,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             } else {
               return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
+                hd: x3,
+                tl: {
+                  hd: x2,
+                  tl: {
+                    hd: x1,
+                    tl: /* [] */0
+                  }
+                }
+              };
             }
           }
           
@@ -1525,25 +1525,25 @@ function sort_uniq(cmp, l) {
         var c$6 = Curry._2(cmp, x1$1, x2$1);
         if (c$6 === 0) {
           return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
+            hd: x1$1,
+            tl: /* [] */0
+          };
         } else if (c$6 > 0) {
           return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x1$1,
+            tl: {
+              hd: x2$1,
+              tl: /* [] */0
+            }
+          };
         } else {
           return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
+            hd: x2$1,
+            tl: {
+              hd: x1$1,
+              tl: /* [] */0
+            }
+          };
         }
       }
       
diff --git a/lib/js/map.js b/lib/js/map.js
index 2b69d73d7b2..15e2287b948 100644
--- a/lib/js/map.js
+++ b/lib/js/map.js
@@ -15,23 +15,23 @@ function Make(funarg) {
     var hl = height(l);
     var hr = height(r);
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var singleton = function (x, d) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: d,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: d,
+      r: "Empty",
+      h: 1
+    };
   };
   var bal = function (l, x, d, r) {
     var hl;
@@ -41,10 +41,10 @@ function Make(funarg) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var ld = l.d;
@@ -57,27 +57,27 @@ function Make(funarg) {
         return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: d,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: d,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rd = r.d;
@@ -90,10 +90,10 @@ function Make(funarg) {
       return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -105,13 +105,13 @@ function Make(funarg) {
   var add = function (x, data, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: data,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: data,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var d = param.d;
@@ -123,13 +123,13 @@ function Make(funarg) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -152,9 +152,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = Curry._2(funarg.compare, x, param.v);
       if (c === 0) {
@@ -169,9 +169,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -184,9 +184,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -220,9 +220,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -244,9 +244,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -259,9 +259,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -295,9 +295,9 @@ function Make(funarg) {
           var v0 = _v0;
           if (typeof param$1 !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v$1 = param$1.v;
           if (Curry._1(f, v$1)) {
@@ -347,16 +347,16 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -371,9 +371,9 @@ function Make(funarg) {
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -384,16 +384,16 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -408,9 +408,9 @@ function Make(funarg) {
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -419,10 +419,10 @@ function Make(funarg) {
   var remove_min_binding = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -473,13 +473,13 @@ function Make(funarg) {
       var data = Curry._1(f, undefined);
       if (data !== undefined) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: Caml_option.valFromOption(data),
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: Caml_option.valFromOption(data),
+          r: "Empty",
+          h: 1
+        };
       } else {
         return "Empty";
       }
@@ -499,13 +499,13 @@ function Make(funarg) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data$2,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data$2,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -543,13 +543,13 @@ function Make(funarg) {
     var d$p = Curry._1(f, param.d);
     var r$p = map(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: param.v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: param.v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var mapi = function (f, param) {
     if (typeof param !== "object") {
@@ -560,13 +560,13 @@ function Make(funarg) {
     var d$p = Curry._2(f, v, param.d);
     var r$p = mapi(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var fold = function (f, _m, _accu) {
     while(true) {
@@ -663,10 +663,10 @@ function Make(funarg) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
+        "Empty",
+        undefined,
+        "Empty"
+      ];
     }
     var r = param.r;
     var d = param.d;
@@ -675,25 +675,25 @@ function Make(funarg) {
     var c = Curry._2(funarg.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
+        l,
+        Caml_option.some(d),
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, d, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, d, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var merge$1 = function (f, s1, s2) {
     if (typeof s1 !== "object") {
@@ -711,14 +711,14 @@ function Make(funarg) {
     }
     if (typeof s2 !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "map.res",
-              552,
-              11
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "map.res",
+          552,
+          11
+        ],
+        Error: new Error()
+      };
     }
     var v2 = s2.v;
     var match$1 = split(v2, s1);
@@ -780,9 +780,9 @@ function Make(funarg) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var d = param.d;
     var v = param.v;
@@ -795,14 +795,14 @@ function Make(funarg) {
     var rt = match$1[0];
     if (pvd) {
       return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, d, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, d, rf)
+      ];
     }
   };
   var cons_enum = function (_m, _e) {
@@ -908,41 +908,41 @@ function Make(funarg) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          add: add,
-          update: update,
-          singleton: singleton,
-          remove: remove,
-          merge: merge$1,
-          union: union,
-          compare: compare,
-          equal: equal,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          bindings: bindings,
-          min_binding: min_binding,
-          min_binding_opt: min_binding_opt,
-          max_binding: max_binding,
-          max_binding_opt: max_binding_opt,
-          choose: min_binding,
-          choose_opt: min_binding_opt,
-          split: split,
-          find: find,
-          find_opt: find_opt,
-          find_first: find_first,
-          find_first_opt: find_first_opt,
-          find_last: find_last,
-          find_last_opt: find_last_opt,
-          map: map,
-          mapi: mapi
-        };
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    add: add,
+    update: update,
+    singleton: singleton,
+    remove: remove,
+    merge: merge$1,
+    union: union,
+    compare: compare,
+    equal: equal,
+    iter: iter,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    bindings: bindings,
+    min_binding: min_binding,
+    min_binding_opt: min_binding_opt,
+    max_binding: max_binding,
+    max_binding_opt: max_binding_opt,
+    choose: min_binding,
+    choose_opt: min_binding_opt,
+    split: split,
+    find: find,
+    find_opt: find_opt,
+    find_first: find_first,
+    find_first_opt: find_first_opt,
+    find_last: find_last,
+    find_last_opt: find_last_opt,
+    map: map,
+    mapi: mapi
+  };
 }
 
 exports.Make = Make;
diff --git a/lib/js/mapLabels.js b/lib/js/mapLabels.js
index dd74689b08a..4f1bd203fdd 100644
--- a/lib/js/mapLabels.js
+++ b/lib/js/mapLabels.js
@@ -15,23 +15,23 @@ function Make(Ord) {
     var hl = height(l);
     var hr = height(r);
     return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: x,
+      d: d,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var singleton = function (x, d) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: d,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      d: d,
+      r: "Empty",
+      h: 1
+    };
   };
   var bal = function (l, x, d, r) {
     var hl;
@@ -41,10 +41,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var ld = l.d;
@@ -57,27 +57,27 @@ function Make(Ord) {
         return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: d,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: x,
+        d: d,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rd = r.d;
@@ -90,10 +90,10 @@ function Make(Ord) {
       return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Map.bal",
+      Error: new Error()
+    };
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -105,13 +105,13 @@ function Make(Ord) {
   var add = function (x, data, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: data,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        d: data,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var d = param.d;
@@ -123,13 +123,13 @@ function Make(Ord) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -152,9 +152,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var c = Curry._2(Ord.compare, x, param.v);
       if (c === 0) {
@@ -171,9 +171,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -191,9 +191,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -210,9 +210,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -246,9 +246,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -266,9 +266,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -285,9 +285,9 @@ function Make(Ord) {
       var v0 = _v0;
       if (typeof param !== "object") {
         return [
-                v0,
-                d0
-              ];
+          v0,
+          d0
+        ];
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -347,16 +347,16 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -371,9 +371,9 @@ function Make(Ord) {
       var l = param.l;
       if (typeof l !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = l;
       continue ;
@@ -384,16 +384,16 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -408,9 +408,9 @@ function Make(Ord) {
       var r = param.r;
       if (typeof r !== "object") {
         return [
-                param.v,
-                param.d
-              ];
+          param.v,
+          param.d
+        ];
       }
       _param = r;
       continue ;
@@ -419,10 +419,10 @@ function Make(Ord) {
   var remove_min_binding = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Map.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -473,13 +473,13 @@ function Make(Ord) {
       var data = Curry._1(f, undefined);
       if (data !== undefined) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: Caml_option.valFromOption(data),
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: Caml_option.valFromOption(data),
+          r: "Empty",
+          h: 1
+        };
       } else {
         return "Empty";
       }
@@ -499,13 +499,13 @@ function Make(Ord) {
         return param;
       } else {
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: data$2,
-                r: r,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: data$2,
+          r: r,
+          h: param.h
+        };
       }
     }
     if (c < 0) {
@@ -543,13 +543,13 @@ function Make(Ord) {
     var d$p = Curry._1(f, param.d);
     var r$p = map(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: param.v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: param.v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var mapi = function (f, param) {
     if (typeof param !== "object") {
@@ -560,13 +560,13 @@ function Make(Ord) {
     var d$p = Curry._2(f, v, param.d);
     var r$p = mapi(f, param.r);
     return {
-            TAG: "Node",
-            l: l$p,
-            v: v,
-            d: d$p,
-            r: r$p,
-            h: param.h
-          };
+      TAG: "Node",
+      l: l$p,
+      v: v,
+      d: d$p,
+      r: r$p,
+      h: param.h
+    };
   };
   var fold = function (f, _m, _accu) {
     while(true) {
@@ -663,10 +663,10 @@ function Make(Ord) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
+        "Empty",
+        undefined,
+        "Empty"
+      ];
     }
     var r = param.r;
     var d = param.d;
@@ -675,25 +675,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
+        l,
+        Caml_option.some(d),
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, d, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, d, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var merge$1 = function (f, s1, s2) {
     if (typeof s1 !== "object") {
@@ -711,14 +711,14 @@ function Make(Ord) {
     }
     if (typeof s2 !== "object") {
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "mapLabels.res",
-              552,
-              11
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "mapLabels.res",
+          552,
+          11
+        ],
+        Error: new Error()
+      };
     }
     var v2 = s2.v;
     var match$1 = split(v2, s1);
@@ -780,9 +780,9 @@ function Make(Ord) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var d = param.d;
     var v = param.v;
@@ -795,14 +795,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pvd) {
       return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, d, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, d, rf)
+      ];
     }
   };
   var cons_enum = function (_m, _e) {
@@ -908,56 +908,56 @@ function Make(Ord) {
     return bindings_aux(/* [] */0, s);
   };
   return {
-          height: height,
-          create: create,
-          singleton: singleton,
-          bal: bal,
-          empty: "Empty",
-          is_empty: is_empty,
-          add: add,
-          find: find,
-          find_first_aux: find_first_aux,
-          find_first: find_first,
-          find_first_opt_aux: find_first_opt_aux,
-          find_first_opt: find_first_opt,
-          find_last_aux: find_last_aux,
-          find_last: find_last,
-          find_last_opt_aux: find_last_opt_aux,
-          find_last_opt: find_last_opt,
-          find_opt: find_opt,
-          mem: mem,
-          min_binding: min_binding,
-          min_binding_opt: min_binding_opt,
-          max_binding: max_binding,
-          max_binding_opt: max_binding_opt,
-          remove_min_binding: remove_min_binding,
-          remove: remove,
-          update: update,
-          iter: iter,
-          map: map,
-          mapi: mapi,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          add_min_binding: add_min_binding,
-          add_max_binding: add_max_binding,
-          join: join,
-          concat: concat,
-          concat_or_join: concat_or_join,
-          split: split,
-          merge: merge$1,
-          union: union,
-          filter: filter,
-          partition: partition,
-          cons_enum: cons_enum,
-          compare: compare,
-          equal: equal,
-          cardinal: cardinal,
-          bindings_aux: bindings_aux,
-          bindings: bindings,
-          choose: min_binding,
-          choose_opt: min_binding_opt
-        };
+    height: height,
+    create: create,
+    singleton: singleton,
+    bal: bal,
+    empty: "Empty",
+    is_empty: is_empty,
+    add: add,
+    find: find,
+    find_first_aux: find_first_aux,
+    find_first: find_first,
+    find_first_opt_aux: find_first_opt_aux,
+    find_first_opt: find_first_opt,
+    find_last_aux: find_last_aux,
+    find_last: find_last,
+    find_last_opt_aux: find_last_opt_aux,
+    find_last_opt: find_last_opt,
+    find_opt: find_opt,
+    mem: mem,
+    min_binding: min_binding,
+    min_binding_opt: min_binding_opt,
+    max_binding: max_binding,
+    max_binding_opt: max_binding_opt,
+    remove_min_binding: remove_min_binding,
+    remove: remove,
+    update: update,
+    iter: iter,
+    map: map,
+    mapi: mapi,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    add_min_binding: add_min_binding,
+    add_max_binding: add_max_binding,
+    join: join,
+    concat: concat,
+    concat_or_join: concat_or_join,
+    split: split,
+    merge: merge$1,
+    union: union,
+    filter: filter,
+    partition: partition,
+    cons_enum: cons_enum,
+    compare: compare,
+    equal: equal,
+    cardinal: cardinal,
+    bindings_aux: bindings_aux,
+    bindings: bindings,
+    choose: min_binding,
+    choose_opt: min_binding_opt
+  };
 }
 
 exports.Make = Make;
diff --git a/lib/js/moreLabels.js b/lib/js/moreLabels.js
index 9ee78021a60..e9142b73f06 100644
--- a/lib/js/moreLabels.js
+++ b/lib/js/moreLabels.js
@@ -45,23 +45,23 @@ var $$Map = {
         var hl = height(l);
         var hr = height(r);
         return {
-                TAG: "Node",
-                l: l,
-                v: x,
-                d: d,
-                r: r,
-                h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-              };
+          TAG: "Node",
+          l: l,
+          v: x,
+          d: d,
+          r: r,
+          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+        };
       };
       var singleton = function (x, d) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                d: d,
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          d: d,
+          r: "Empty",
+          h: 1
+        };
       };
       var bal = function (l, x, d, r) {
         var hl;
@@ -71,10 +71,10 @@ var $$Map = {
         if (hl > (hr + 2 | 0)) {
           if (typeof l !== "object") {
             throw {
-                  RE_EXN_ID: "Invalid_argument",
-                  _1: "Map.bal",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Invalid_argument",
+              _1: "Map.bal",
+              Error: new Error()
+            };
           }
           var lr = l.r;
           var ld = l.d;
@@ -87,27 +87,27 @@ var $$Map = {
             return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
           }
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.bal",
+            Error: new Error()
+          };
         }
         if (hr <= (hl + 2 | 0)) {
           return {
-                  TAG: "Node",
-                  l: l,
-                  v: x,
-                  d: d,
-                  r: r,
-                  h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-                };
+            TAG: "Node",
+            l: l,
+            v: x,
+            d: d,
+            r: r,
+            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+          };
         }
         if (typeof r !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.bal",
+            Error: new Error()
+          };
         }
         var rr = r.r;
         var rd = r.d;
@@ -120,10 +120,10 @@ var $$Map = {
           return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
         }
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Map.bal",
+          Error: new Error()
+        };
       };
       var is_empty = function (param) {
         if (typeof param !== "object") {
@@ -135,13 +135,13 @@ var $$Map = {
       var add = function (x, data, param) {
         if (typeof param !== "object") {
           return {
-                  TAG: "Node",
-                  l: "Empty",
-                  v: x,
-                  d: data,
-                  r: "Empty",
-                  h: 1
-                };
+            TAG: "Node",
+            l: "Empty",
+            v: x,
+            d: data,
+            r: "Empty",
+            h: 1
+          };
         }
         var r = param.r;
         var d = param.d;
@@ -153,13 +153,13 @@ var $$Map = {
             return param;
           } else {
             return {
-                    TAG: "Node",
-                    l: l,
-                    v: x,
-                    d: data,
-                    r: r,
-                    h: param.h
-                  };
+              TAG: "Node",
+              l: l,
+              v: x,
+              d: data,
+              r: r,
+              h: param.h
+            };
           }
         }
         if (c < 0) {
@@ -182,9 +182,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var c = Curry._2(funarg.compare, x, param.v);
           if (c === 0) {
@@ -201,9 +201,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -221,9 +221,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -240,9 +240,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -276,9 +276,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -296,9 +296,9 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -315,9 +315,9 @@ var $$Map = {
           var v0 = _v0;
           if (typeof param !== "object") {
             return [
-                    v0,
-                    d0
-                  ];
+              v0,
+              d0
+            ];
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -377,16 +377,16 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var l = param.l;
           if (typeof l !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = l;
           continue ;
@@ -401,9 +401,9 @@ var $$Map = {
           var l = param.l;
           if (typeof l !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = l;
           continue ;
@@ -414,16 +414,16 @@ var $$Map = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var r = param.r;
           if (typeof r !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = r;
           continue ;
@@ -438,9 +438,9 @@ var $$Map = {
           var r = param.r;
           if (typeof r !== "object") {
             return [
-                    param.v,
-                    param.d
-                  ];
+              param.v,
+              param.d
+            ];
           }
           _param = r;
           continue ;
@@ -449,10 +449,10 @@ var $$Map = {
       var remove_min_binding = function (param) {
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Map.remove_min_elt",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Map.remove_min_elt",
+            Error: new Error()
+          };
         }
         var l = param.l;
         if (typeof l !== "object") {
@@ -503,13 +503,13 @@ var $$Map = {
           var data = Curry._1(f, undefined);
           if (data !== undefined) {
             return {
-                    TAG: "Node",
-                    l: "Empty",
-                    v: x,
-                    d: Caml_option.valFromOption(data),
-                    r: "Empty",
-                    h: 1
-                  };
+              TAG: "Node",
+              l: "Empty",
+              v: x,
+              d: Caml_option.valFromOption(data),
+              r: "Empty",
+              h: 1
+            };
           } else {
             return "Empty";
           }
@@ -529,13 +529,13 @@ var $$Map = {
             return param;
           } else {
             return {
-                    TAG: "Node",
-                    l: l,
-                    v: x,
-                    d: data$2,
-                    r: r,
-                    h: param.h
-                  };
+              TAG: "Node",
+              l: l,
+              v: x,
+              d: data$2,
+              r: r,
+              h: param.h
+            };
           }
         }
         if (c < 0) {
@@ -573,13 +573,13 @@ var $$Map = {
         var d$p = Curry._1(f, param.d);
         var r$p = map(f, param.r);
         return {
-                TAG: "Node",
-                l: l$p,
-                v: param.v,
-                d: d$p,
-                r: r$p,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l$p,
+          v: param.v,
+          d: d$p,
+          r: r$p,
+          h: param.h
+        };
       };
       var mapi = function (f, param) {
         if (typeof param !== "object") {
@@ -590,13 +590,13 @@ var $$Map = {
         var d$p = Curry._2(f, v, param.d);
         var r$p = mapi(f, param.r);
         return {
-                TAG: "Node",
-                l: l$p,
-                v: v,
-                d: d$p,
-                r: r$p,
-                h: param.h
-              };
+          TAG: "Node",
+          l: l$p,
+          v: v,
+          d: d$p,
+          r: r$p,
+          h: param.h
+        };
       };
       var fold = function (f, _m, _accu) {
         while(true) {
@@ -693,10 +693,10 @@ var $$Map = {
       var split = function (x, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  undefined,
-                  "Empty"
-                ];
+            "Empty",
+            undefined,
+            "Empty"
+          ];
         }
         var r = param.r;
         var d = param.d;
@@ -705,25 +705,25 @@ var $$Map = {
         var c = Curry._2(funarg.compare, x, v);
         if (c === 0) {
           return [
-                  l,
-                  Caml_option.some(d),
-                  r
-                ];
+            l,
+            Caml_option.some(d),
+            r
+          ];
         }
         if (c < 0) {
           var match = split(x, l);
           return [
-                  match[0],
-                  match[1],
-                  join(match[2], v, d, r)
-                ];
+            match[0],
+            match[1],
+            join(match[2], v, d, r)
+          ];
         }
         var match$1 = split(x, r);
         return [
-                join(l, v, d, match$1[0]),
-                match$1[1],
-                match$1[2]
-              ];
+          join(l, v, d, match$1[0]),
+          match$1[1],
+          match$1[2]
+        ];
       };
       var merge$1 = function (f, s1, s2) {
         if (typeof s1 !== "object") {
@@ -741,14 +741,14 @@ var $$Map = {
         }
         if (typeof s2 !== "object") {
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "mapLabels.res",
-                  552,
-                  11
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "mapLabels.res",
+              552,
+              11
+            ],
+            Error: new Error()
+          };
         }
         var v2 = s2.v;
         var match$1 = split(v2, s1);
@@ -810,9 +810,9 @@ var $$Map = {
       var partition = function (p, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  "Empty"
-                ];
+            "Empty",
+            "Empty"
+          ];
         }
         var d = param.d;
         var v = param.v;
@@ -825,14 +825,14 @@ var $$Map = {
         var rt = match$1[0];
         if (pvd) {
           return [
-                  join(lt, v, d, rt),
-                  concat(lf, rf)
-                ];
+            join(lt, v, d, rt),
+            concat(lf, rf)
+          ];
         } else {
           return [
-                  concat(lt, rt),
-                  join(lf, v, d, rf)
-                ];
+            concat(lt, rt),
+            join(lf, v, d, rf)
+          ];
         }
       };
       var cons_enum = function (_m, _e) {
@@ -938,41 +938,41 @@ var $$Map = {
         return bindings_aux(/* [] */0, s);
       };
       return {
-              empty: "Empty",
-              is_empty: is_empty,
-              mem: mem,
-              add: add,
-              update: update,
-              singleton: singleton,
-              remove: remove,
-              merge: merge$1,
-              union: union,
-              compare: compare,
-              equal: equal,
-              iter: iter,
-              fold: fold,
-              for_all: for_all,
-              exists: exists,
-              filter: filter,
-              partition: partition,
-              cardinal: cardinal,
-              bindings: bindings,
-              min_binding: min_binding,
-              min_binding_opt: min_binding_opt,
-              max_binding: max_binding,
-              max_binding_opt: max_binding_opt,
-              choose: min_binding,
-              choose_opt: min_binding_opt,
-              split: split,
-              find: find,
-              find_opt: find_opt,
-              find_first: find_first,
-              find_first_opt: find_first_opt,
-              find_last: find_last,
-              find_last_opt: find_last_opt,
-              map: map,
-              mapi: mapi
-            };
+        empty: "Empty",
+        is_empty: is_empty,
+        mem: mem,
+        add: add,
+        update: update,
+        singleton: singleton,
+        remove: remove,
+        merge: merge$1,
+        union: union,
+        compare: compare,
+        equal: equal,
+        iter: iter,
+        fold: fold,
+        for_all: for_all,
+        exists: exists,
+        filter: filter,
+        partition: partition,
+        cardinal: cardinal,
+        bindings: bindings,
+        min_binding: min_binding,
+        min_binding_opt: min_binding_opt,
+        max_binding: max_binding,
+        max_binding_opt: max_binding_opt,
+        choose: min_binding,
+        choose_opt: min_binding_opt,
+        split: split,
+        find: find,
+        find_opt: find_opt,
+        find_first: find_first,
+        find_first_opt: find_first_opt,
+        find_last: find_last,
+        find_last_opt: find_last_opt,
+        map: map,
+        mapi: mapi
+      };
     })
 };
 
@@ -991,12 +991,12 @@ var $$Set = {
         var hr;
         hr = typeof r !== "object" ? 0 : r.h;
         return {
-                TAG: "Node",
-                l: l,
-                v: v,
-                r: r,
-                h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-              };
+          TAG: "Node",
+          l: l,
+          v: v,
+          r: r,
+          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+        };
       };
       var bal = function (l, v, r) {
         var hl;
@@ -1006,10 +1006,10 @@ var $$Set = {
         if (hl > (hr + 2 | 0)) {
           if (typeof l !== "object") {
             throw {
-                  RE_EXN_ID: "Invalid_argument",
-                  _1: "Set.bal",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Invalid_argument",
+              _1: "Set.bal",
+              Error: new Error()
+            };
           }
           var lr = l.r;
           var lv = l.v;
@@ -1021,26 +1021,26 @@ var $$Set = {
             return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
           }
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.bal",
+            Error: new Error()
+          };
         }
         if (hr <= (hl + 2 | 0)) {
           return {
-                  TAG: "Node",
-                  l: l,
-                  v: v,
-                  r: r,
-                  h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-                };
+            TAG: "Node",
+            l: l,
+            v: v,
+            r: r,
+            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+          };
         }
         if (typeof r !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.bal",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.bal",
+            Error: new Error()
+          };
         }
         var rr = r.r;
         var rv = r.v;
@@ -1052,20 +1052,20 @@ var $$Set = {
           return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
         }
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       };
       var add = function (x, param) {
         if (typeof param !== "object") {
           return {
-                  TAG: "Node",
-                  l: "Empty",
-                  v: x,
-                  r: "Empty",
-                  h: 1
-                };
+            TAG: "Node",
+            l: "Empty",
+            v: x,
+            r: "Empty",
+            h: 1
+          };
         }
         var r = param.r;
         var v = param.v;
@@ -1091,12 +1091,12 @@ var $$Set = {
       };
       var singleton = function (x) {
         return {
-                TAG: "Node",
-                l: "Empty",
-                v: x,
-                r: "Empty",
-                h: 1
-              };
+          TAG: "Node",
+          l: "Empty",
+          v: x,
+          r: "Empty",
+          h: 1
+        };
       };
       var add_min_element = function (x, param) {
         if (typeof param !== "object") {
@@ -1134,9 +1134,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var l = param.l;
           if (typeof l !== "object") {
@@ -1165,9 +1165,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var r = param.r;
           if (typeof r !== "object") {
@@ -1194,10 +1194,10 @@ var $$Set = {
       var remove_min_elt = function (param) {
         if (typeof param !== "object") {
           throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Set.remove_min_elt",
-                Error: new Error()
-              };
+            RE_EXN_ID: "Invalid_argument",
+            _1: "Set.remove_min_elt",
+            Error: new Error()
+          };
         }
         var l = param.l;
         if (typeof l !== "object") {
@@ -1227,10 +1227,10 @@ var $$Set = {
       var split = function (x, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  false,
-                  "Empty"
-                ];
+            "Empty",
+            false,
+            "Empty"
+          ];
         }
         var r = param.r;
         var v = param.v;
@@ -1238,25 +1238,25 @@ var $$Set = {
         var c = Curry._2(funarg.compare, x, v);
         if (c === 0) {
           return [
-                  l,
-                  true,
-                  r
-                ];
+            l,
+            true,
+            r
+          ];
         }
         if (c < 0) {
           var match = split(x, l);
           return [
-                  match[0],
-                  match[1],
-                  join(match[2], v, r)
-                ];
+            match[0],
+            match[1],
+            join(match[2], v, r)
+          ];
         }
         var match$1 = split(x, r);
         return [
-                join(l, v, match$1[0]),
-                match$1[1],
-                match$1[2]
-              ];
+          join(l, v, match$1[0]),
+          match$1[1],
+          match$1[2]
+        ];
       };
       var is_empty = function (param) {
         if (typeof param !== "object") {
@@ -1540,9 +1540,9 @@ var $$Set = {
       var partition = function (p, param) {
         if (typeof param !== "object") {
           return [
-                  "Empty",
-                  "Empty"
-                ];
+            "Empty",
+            "Empty"
+          ];
         }
         var v = param.v;
         var match = partition(p, param.l);
@@ -1554,14 +1554,14 @@ var $$Set = {
         var rt = match$1[0];
         if (pv) {
           return [
-                  join(lt, v, rt),
-                  concat(lf, rf)
-                ];
+            join(lt, v, rt),
+            concat(lf, rf)
+          ];
         } else {
           return [
-                  concat(lt, rt),
-                  join(lf, v, rf)
-                ];
+            concat(lt, rt),
+            join(lf, v, rf)
+          ];
         }
       };
       var cardinal = function (param) {
@@ -1594,9 +1594,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           var c = Curry._2(funarg.compare, x, v);
@@ -1629,9 +1629,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -1694,9 +1694,9 @@ var $$Set = {
           var param = _param;
           if (typeof param !== "object") {
             throw {
-                  RE_EXN_ID: "Not_found",
-                  Error: new Error()
-                };
+              RE_EXN_ID: "Not_found",
+              Error: new Error()
+            };
           }
           var v = param.v;
           if (Curry._1(f, v)) {
@@ -1780,21 +1780,21 @@ var $$Set = {
           switch (n) {
             case 0 :
                 return [
-                        "Empty",
-                        l
-                      ];
+                  "Empty",
+                  l
+                ];
             case 1 :
                 if (l) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          l.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    l.tl
+                  ];
                 }
                 break;
             case 2 :
@@ -1802,21 +1802,21 @@ var $$Set = {
                   var match = l.tl;
                   if (match) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match.hd,
-                              r: "Empty",
-                              h: 2
-                            },
-                            match.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match.hd,
+                        r: "Empty",
+                        h: 2
+                      },
+                      match.tl
+                    ];
                   }
                   
                 }
@@ -1828,27 +1828,27 @@ var $$Set = {
                     var match$2 = match$1.tl;
                     if (match$2) {
                       return [
-                              {
-                                TAG: "Node",
-                                l: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: l.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                v: match$1.hd,
-                                r: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: match$2.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                h: 2
-                              },
-                              match$2.tl
-                            ];
+                        {
+                          TAG: "Node",
+                          l: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: l.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          v: match$1.hd,
+                          r: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: match$2.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          h: 2
+                        },
+                        match$2.tl
+                      ];
                     }
                     
                   }
@@ -1864,19 +1864,19 @@ var $$Set = {
           if (l$1) {
             var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
             return [
-                    create(match$3[0], l$1.hd, match$4[0]),
-                    match$4[1]
-                  ];
+              create(match$3[0], l$1.hd, match$4[0]),
+              match$4[1]
+            ];
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "setLabels.res",
-                  691,
-                  20
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "setLabels.res",
+              691,
+              20
+            ],
+            Error: new Error()
+          };
         };
         return sub(List.length(l), l)[0];
       };
@@ -1912,42 +1912,42 @@ var $$Set = {
         }
       };
       return {
-              empty: "Empty",
-              is_empty: is_empty,
-              mem: mem,
-              add: add,
-              singleton: singleton,
-              remove: remove,
-              union: union,
-              inter: inter,
-              diff: diff,
-              compare: compare,
-              equal: equal,
-              subset: subset,
-              iter: iter,
-              map: map,
-              fold: fold,
-              for_all: for_all,
-              exists: exists,
-              filter: filter,
-              partition: partition,
-              cardinal: cardinal,
-              elements: elements,
-              min_elt: min_elt,
-              min_elt_opt: min_elt_opt,
-              max_elt: max_elt,
-              max_elt_opt: max_elt_opt,
-              choose: min_elt,
-              choose_opt: min_elt_opt,
-              split: split,
-              find: find,
-              find_opt: find_opt,
-              find_first: find_first,
-              find_first_opt: find_first_opt,
-              find_last: find_last,
-              find_last_opt: find_last_opt,
-              of_list: of_list
-            };
+        empty: "Empty",
+        is_empty: is_empty,
+        mem: mem,
+        add: add,
+        singleton: singleton,
+        remove: remove,
+        union: union,
+        inter: inter,
+        diff: diff,
+        compare: compare,
+        equal: equal,
+        subset: subset,
+        iter: iter,
+        map: map,
+        fold: fold,
+        for_all: for_all,
+        exists: exists,
+        filter: filter,
+        partition: partition,
+        cardinal: cardinal,
+        elements: elements,
+        min_elt: min_elt,
+        min_elt_opt: min_elt_opt,
+        max_elt: max_elt,
+        max_elt_opt: max_elt_opt,
+        choose: min_elt,
+        choose_opt: min_elt_opt,
+        split: split,
+        find: find,
+        find_opt: find_opt,
+        find_first: find_first,
+        find_first_opt: find_first_opt,
+        find_last: find_last,
+        find_last_opt: find_last_opt,
+        of_list: of_list
+      };
     })
 };
 
diff --git a/lib/js/parsing.js b/lib/js/parsing.js
index a041925b2cd..ee06d01fcdd 100644
--- a/lib/js/parsing.js
+++ b/lib/js/parsing.js
@@ -89,9 +89,9 @@ function yyparse(tables, start, lexer, lexbuf) {
             continue ;
         case "Raise_parse_error" :
             throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
+              RE_EXN_ID: Parse_error,
+              Error: new Error()
+            };
         case "Grow_stacks_1" :
             grow_stacks();
             _arg = undefined;
diff --git a/lib/js/pervasives.js b/lib/js/pervasives.js
index a1b76422ca1..b77cd3650f8 100644
--- a/lib/js/pervasives.js
+++ b/lib/js/pervasives.js
@@ -15,18 +15,18 @@ var JsxModules = {
 
 function failwith(s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function invalid_arg(s) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var Exit = /* @__PURE__ */Caml_exceptions.create("Pervasives.Exit");
@@ -64,10 +64,10 @@ function classify_float(x) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "char_of_int",
+      Error: new Error()
+    };
   }
   return n;
 }
@@ -88,10 +88,10 @@ function bool_of_string(param) {
         return true;
     default:
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "bool_of_string",
+        Error: new Error()
+      };
   }
 }
 
@@ -163,9 +163,9 @@ function float_of_string_opt(s) {
 function $at(l1, l2) {
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: $at(l1.tl, l2)
+    };
   } else {
     return l2;
   }
diff --git a/lib/js/pervasivesU.js b/lib/js/pervasivesU.js
index 2f53bd01cd3..a3727ad9f7b 100644
--- a/lib/js/pervasivesU.js
+++ b/lib/js/pervasivesU.js
@@ -14,18 +14,18 @@ var JsxModules = {
 
 function failwith(s) {
   throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Failure",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function invalid_arg(s) {
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 var Exit = /* @__PURE__ */Caml_exceptions.create("PervasivesU.Exit");
@@ -63,10 +63,10 @@ function classify_float(x) {
 function char_of_int(n) {
   if (n < 0 || n > 255) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "char_of_int",
+      Error: new Error()
+    };
   }
   return n;
 }
@@ -87,10 +87,10 @@ function bool_of_string(param) {
         return true;
     default:
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "bool_of_string",
+        Error: new Error()
+      };
   }
 }
 
@@ -162,9 +162,9 @@ function float_of_string_opt(s) {
 function $at(l1, l2) {
   if (l1) {
     return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
+      hd: l1.hd,
+      tl: $at(l1.tl, l2)
+    };
   } else {
     return l2;
   }
diff --git a/lib/js/queue.js b/lib/js/queue.js
index a733d2fc826..12e8ed2e4c0 100644
--- a/lib/js/queue.js
+++ b/lib/js/queue.js
@@ -7,10 +7,10 @@ var Empty = /* @__PURE__ */Caml_exceptions.create("Queue.Empty");
 
 function create(param) {
   return {
-          length: 0,
-          first: "Nil",
-          last: "Nil"
-        };
+    length: 0,
+    first: "Nil",
+    last: "Nil"
+  };
 }
 
 function clear(q) {
@@ -43,18 +43,18 @@ function peek(q) {
     return match.content;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function take(q) {
   var match = q.first;
   if (typeof match !== "object") {
     throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
+      RE_EXN_ID: Empty,
+      Error: new Error()
+    };
   }
   var content = match.content;
   var next = match.next;
diff --git a/lib/js/random.js b/lib/js/random.js
index f0ceb6521d2..21c60f99b1d 100644
--- a/lib/js/random.js
+++ b/lib/js/random.js
@@ -76,10 +76,10 @@ function bits(s) {
 function $$int(s, bound) {
   if (bound > 1073741823 || bound <= 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int",
+      Error: new Error()
+    };
   }
   while(true) {
     var r = bits(s);
@@ -94,10 +94,10 @@ function $$int(s, bound) {
 function int32(s, bound) {
   if (bound <= 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int32",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int32",
+      Error: new Error()
+    };
   }
   while(true) {
     var b1 = bits(s);
@@ -114,10 +114,10 @@ function int32(s, bound) {
 function int64(s, bound) {
   if (Caml.i64_le(bound, Caml_int64.zero)) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Random.int64",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Random.int64",
+      Error: new Error()
+    };
   }
   while(true) {
     var b1 = Caml_int64.of_int32(bits(s));
diff --git a/lib/js/set.js b/lib/js/set.js
index d442b7f9ae7..8aed33180c4 100644
--- a/lib/js/set.js
+++ b/lib/js/set.js
@@ -18,12 +18,12 @@ function Make(funarg) {
     var hr;
     hr = typeof r !== "object" ? 0 : r.h;
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var bal = function (l, v, r) {
     var hl;
@@ -33,10 +33,10 @@ function Make(funarg) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var lv = l.v;
@@ -48,26 +48,26 @@ function Make(funarg) {
         return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: v,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: v,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rv = r.v;
@@ -79,20 +79,20 @@ function Make(funarg) {
       return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   };
   var add = function (x, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var v = param.v;
@@ -118,12 +118,12 @@ function Make(funarg) {
   };
   var singleton = function (x) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   };
   var add_min_element = function (x, param) {
     if (typeof param !== "object") {
@@ -161,9 +161,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
@@ -192,9 +192,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
@@ -221,10 +221,10 @@ function Make(funarg) {
   var remove_min_elt = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -245,10 +245,10 @@ function Make(funarg) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              false,
-              "Empty"
-            ];
+        "Empty",
+        false,
+        "Empty"
+      ];
     }
     var r = param.r;
     var v = param.v;
@@ -256,25 +256,25 @@ function Make(funarg) {
     var c = Curry._2(funarg.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -563,9 +563,9 @@ function Make(funarg) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var v = param.v;
     var match = partition(p, param.l);
@@ -577,14 +577,14 @@ function Make(funarg) {
     var rt = match$1[0];
     if (pv) {
       return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, rf)
+      ];
     }
   };
   var cardinal = function (param) {
@@ -617,9 +617,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       var c = Curry._2(funarg.compare, x, v);
@@ -635,9 +635,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -698,9 +698,9 @@ function Make(funarg) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -817,21 +817,21 @@ function Make(funarg) {
           switch (n) {
             case 0 :
                 return [
-                        "Empty",
-                        l
-                      ];
+                  "Empty",
+                  l
+                ];
             case 1 :
                 if (l) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          l.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    l.tl
+                  ];
                 }
                 break;
             case 2 :
@@ -839,21 +839,21 @@ function Make(funarg) {
                   var match = l.tl;
                   if (match) {
                     return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match.hd,
-                              r: "Empty",
-                              h: 2
-                            },
-                            match.tl
-                          ];
+                      {
+                        TAG: "Node",
+                        l: {
+                          TAG: "Node",
+                          l: "Empty",
+                          v: l.hd,
+                          r: "Empty",
+                          h: 1
+                        },
+                        v: match.hd,
+                        r: "Empty",
+                        h: 2
+                      },
+                      match.tl
+                    ];
                   }
                   
                 }
@@ -865,27 +865,27 @@ function Make(funarg) {
                     var match$2 = match$1.tl;
                     if (match$2) {
                       return [
-                              {
-                                TAG: "Node",
-                                l: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: l.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                v: match$1.hd,
-                                r: {
-                                  TAG: "Node",
-                                  l: "Empty",
-                                  v: match$2.hd,
-                                  r: "Empty",
-                                  h: 1
-                                },
-                                h: 2
-                              },
-                              match$2.tl
-                            ];
+                        {
+                          TAG: "Node",
+                          l: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: l.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          v: match$1.hd,
+                          r: {
+                            TAG: "Node",
+                            l: "Empty",
+                            v: match$2.hd,
+                            r: "Empty",
+                            h: 1
+                          },
+                          h: 2
+                        },
+                        match$2.tl
+                      ];
                     }
                     
                   }
@@ -901,19 +901,19 @@ function Make(funarg) {
           if (l$1) {
             var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
             return [
-                    create(match$3[0], l$1.hd, match$4[0]),
-                    match$4[1]
-                  ];
+              create(match$3[0], l$1.hd, match$4[0]),
+              match$4[1]
+            ];
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "set.res",
-                  691,
-                  20
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "set.res",
+              691,
+              20
+            ],
+            Error: new Error()
+          };
         };
         return sub(List.length(l$1), l$1)[0];
       } else {
@@ -924,42 +924,42 @@ function Make(funarg) {
     }
   };
   return {
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          add: add,
-          singleton: singleton,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          map: map,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements: elements,
-          min_elt: min_elt,
-          min_elt_opt: min_elt_opt,
-          max_elt: max_elt,
-          max_elt_opt: max_elt_opt,
-          choose: min_elt,
-          choose_opt: min_elt_opt,
-          split: split,
-          find: find,
-          find_opt: find_opt,
-          find_first: find_first,
-          find_first_opt: find_first_opt,
-          find_last: find_last,
-          find_last_opt: find_last_opt,
-          of_list: of_list
-        };
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    add: add,
+    singleton: singleton,
+    remove: remove,
+    union: union,
+    inter: inter,
+    diff: diff,
+    compare: compare,
+    equal: equal,
+    subset: subset,
+    iter: iter,
+    map: map,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    elements: elements,
+    min_elt: min_elt,
+    min_elt_opt: min_elt_opt,
+    max_elt: max_elt,
+    max_elt_opt: max_elt_opt,
+    choose: min_elt,
+    choose_opt: min_elt_opt,
+    split: split,
+    find: find,
+    find_opt: find_opt,
+    find_first: find_first,
+    find_first_opt: find_first_opt,
+    find_last: find_last,
+    find_last_opt: find_last_opt,
+    of_list: of_list
+  };
 }
 
 exports.Make = Make;
diff --git a/lib/js/setLabels.js b/lib/js/setLabels.js
index b59926cf7fe..545749675b6 100644
--- a/lib/js/setLabels.js
+++ b/lib/js/setLabels.js
@@ -18,12 +18,12 @@ function Make(Ord) {
     var hr;
     hr = typeof r !== "object" ? 0 : r.h;
     return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
+      TAG: "Node",
+      l: l,
+      v: v,
+      r: r,
+      h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+    };
   };
   var bal = function (l, v, r) {
     var hl;
@@ -33,10 +33,10 @@ function Make(Ord) {
     if (hl > (hr + 2 | 0)) {
       if (typeof l !== "object") {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Set.bal",
+          Error: new Error()
+        };
       }
       var lr = l.r;
       var lv = l.v;
@@ -48,26 +48,26 @@ function Make(Ord) {
         return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
       }
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     if (hr <= (hl + 2 | 0)) {
       return {
-              TAG: "Node",
-              l: l,
-              v: v,
-              r: r,
-              h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
+        TAG: "Node",
+        l: l,
+        v: v,
+        r: r,
+        h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
+      };
     }
     if (typeof r !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.bal",
+        Error: new Error()
+      };
     }
     var rr = r.r;
     var rv = r.v;
@@ -79,20 +79,20 @@ function Make(Ord) {
       return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
     }
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "Set.bal",
+      Error: new Error()
+    };
   };
   var add = function (x, param) {
     if (typeof param !== "object") {
       return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              r: "Empty",
-              h: 1
-            };
+        TAG: "Node",
+        l: "Empty",
+        v: x,
+        r: "Empty",
+        h: 1
+      };
     }
     var r = param.r;
     var v = param.v;
@@ -118,12 +118,12 @@ function Make(Ord) {
   };
   var singleton = function (x) {
     return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
+      TAG: "Node",
+      l: "Empty",
+      v: x,
+      r: "Empty",
+      h: 1
+    };
   };
   var add_min_element = function (x, param) {
     if (typeof param !== "object") {
@@ -161,9 +161,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var l = param.l;
       if (typeof l !== "object") {
@@ -192,9 +192,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var r = param.r;
       if (typeof r !== "object") {
@@ -221,10 +221,10 @@ function Make(Ord) {
   var remove_min_elt = function (param) {
     if (typeof param !== "object") {
       throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Invalid_argument",
+        _1: "Set.remove_min_elt",
+        Error: new Error()
+      };
     }
     var l = param.l;
     if (typeof l !== "object") {
@@ -254,10 +254,10 @@ function Make(Ord) {
   var split = function (x, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              false,
-              "Empty"
-            ];
+        "Empty",
+        false,
+        "Empty"
+      ];
     }
     var r = param.r;
     var v = param.v;
@@ -265,25 +265,25 @@ function Make(Ord) {
     var c = Curry._2(Ord.compare, x, v);
     if (c === 0) {
       return [
-              l,
-              true,
-              r
-            ];
+        l,
+        true,
+        r
+      ];
     }
     if (c < 0) {
       var match = split(x, l);
       return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
+        match[0],
+        match[1],
+        join(match[2], v, r)
+      ];
     }
     var match$1 = split(x, r);
     return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
+      join(l, v, match$1[0]),
+      match$1[1],
+      match$1[2]
+    ];
   };
   var is_empty = function (param) {
     if (typeof param !== "object") {
@@ -567,9 +567,9 @@ function Make(Ord) {
   var partition = function (p, param) {
     if (typeof param !== "object") {
       return [
-              "Empty",
-              "Empty"
-            ];
+        "Empty",
+        "Empty"
+      ];
     }
     var v = param.v;
     var match = partition(p, param.l);
@@ -581,14 +581,14 @@ function Make(Ord) {
     var rt = match$1[0];
     if (pv) {
       return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
+        join(lt, v, rt),
+        concat(lf, rf)
+      ];
     } else {
       return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
+        concat(lt, rt),
+        join(lf, v, rf)
+      ];
     }
   };
   var cardinal = function (param) {
@@ -621,9 +621,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       var c = Curry._2(Ord.compare, x, v);
@@ -656,9 +656,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -721,9 +721,9 @@ function Make(Ord) {
       var param = _param;
       if (typeof param !== "object") {
         throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Not_found",
+          Error: new Error()
+        };
       }
       var v = param.v;
       if (Curry._1(f, v)) {
@@ -807,21 +807,21 @@ function Make(Ord) {
       switch (n) {
         case 0 :
             return [
-                    "Empty",
-                    l
-                  ];
+              "Empty",
+              l
+            ];
         case 1 :
             if (l) {
               return [
-                      {
-                        TAG: "Node",
-                        l: "Empty",
-                        v: l.hd,
-                        r: "Empty",
-                        h: 1
-                      },
-                      l.tl
-                    ];
+                {
+                  TAG: "Node",
+                  l: "Empty",
+                  v: l.hd,
+                  r: "Empty",
+                  h: 1
+                },
+                l.tl
+              ];
             }
             break;
         case 2 :
@@ -829,21 +829,21 @@ function Make(Ord) {
               var match = l.tl;
               if (match) {
                 return [
-                        {
-                          TAG: "Node",
-                          l: {
-                            TAG: "Node",
-                            l: "Empty",
-                            v: l.hd,
-                            r: "Empty",
-                            h: 1
-                          },
-                          v: match.hd,
-                          r: "Empty",
-                          h: 2
-                        },
-                        match.tl
-                      ];
+                  {
+                    TAG: "Node",
+                    l: {
+                      TAG: "Node",
+                      l: "Empty",
+                      v: l.hd,
+                      r: "Empty",
+                      h: 1
+                    },
+                    v: match.hd,
+                    r: "Empty",
+                    h: 2
+                  },
+                  match.tl
+                ];
               }
               
             }
@@ -855,27 +855,27 @@ function Make(Ord) {
                 var match$2 = match$1.tl;
                 if (match$2) {
                   return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match$1.hd,
-                            r: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: match$2.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            h: 2
-                          },
-                          match$2.tl
-                        ];
+                    {
+                      TAG: "Node",
+                      l: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: l.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      v: match$1.hd,
+                      r: {
+                        TAG: "Node",
+                        l: "Empty",
+                        v: match$2.hd,
+                        r: "Empty",
+                        h: 1
+                      },
+                      h: 2
+                    },
+                    match$2.tl
+                  ];
                 }
                 
               }
@@ -891,19 +891,19 @@ function Make(Ord) {
       if (l$1) {
         var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
         return [
-                create(match$3[0], l$1.hd, match$4[0]),
-                match$4[1]
-              ];
+          create(match$3[0], l$1.hd, match$4[0]),
+          match$4[1]
+        ];
       }
       throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "setLabels.res",
-              691,
-              20
-            ],
-            Error: new Error()
-          };
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "setLabels.res",
+          691,
+          20
+        ],
+        Error: new Error()
+      };
     };
     return sub(List.length(l), l)[0];
   };
@@ -939,60 +939,60 @@ function Make(Ord) {
     }
   };
   return {
-          height: height,
-          create: create,
-          bal: bal,
-          add: add,
-          singleton: singleton,
-          add_min_element: add_min_element,
-          add_max_element: add_max_element,
-          join: join,
-          min_elt: min_elt,
-          min_elt_opt: min_elt_opt,
-          max_elt: max_elt,
-          max_elt_opt: max_elt_opt,
-          remove_min_elt: remove_min_elt,
-          merge: merge,
-          concat: concat,
-          split: split,
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          cons_enum: cons_enum,
-          compare_aux: compare_aux,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements_aux: elements_aux,
-          elements: elements,
-          choose: min_elt,
-          choose_opt: min_elt_opt,
-          find: find,
-          find_first_aux: find_first_aux,
-          find_first: find_first,
-          find_first_opt_aux: find_first_opt_aux,
-          find_first_opt: find_first_opt,
-          find_last_aux: find_last_aux,
-          find_last: find_last,
-          find_last_opt_aux: find_last_opt_aux,
-          find_last_opt: find_last_opt,
-          find_opt: find_opt,
-          try_join: try_join,
-          map: map,
-          of_sorted_list: of_sorted_list,
-          of_list: of_list
-        };
+    height: height,
+    create: create,
+    bal: bal,
+    add: add,
+    singleton: singleton,
+    add_min_element: add_min_element,
+    add_max_element: add_max_element,
+    join: join,
+    min_elt: min_elt,
+    min_elt_opt: min_elt_opt,
+    max_elt: max_elt,
+    max_elt_opt: max_elt_opt,
+    remove_min_elt: remove_min_elt,
+    merge: merge,
+    concat: concat,
+    split: split,
+    empty: "Empty",
+    is_empty: is_empty,
+    mem: mem,
+    remove: remove,
+    union: union,
+    inter: inter,
+    diff: diff,
+    cons_enum: cons_enum,
+    compare_aux: compare_aux,
+    compare: compare,
+    equal: equal,
+    subset: subset,
+    iter: iter,
+    fold: fold,
+    for_all: for_all,
+    exists: exists,
+    filter: filter,
+    partition: partition,
+    cardinal: cardinal,
+    elements_aux: elements_aux,
+    elements: elements,
+    choose: min_elt,
+    choose_opt: min_elt_opt,
+    find: find,
+    find_first_aux: find_first_aux,
+    find_first: find_first,
+    find_first_opt_aux: find_first_opt_aux,
+    find_first_opt: find_first_opt,
+    find_last_aux: find_last_aux,
+    find_last: find_last,
+    find_last_opt_aux: find_last_opt_aux,
+    find_last_opt: find_last_opt,
+    find_opt: find_opt,
+    try_join: try_join,
+    map: map,
+    of_sorted_list: of_sorted_list,
+    of_list: of_list
+  };
 }
 
 exports.Make = Make;
diff --git a/lib/js/sort.js b/lib/js/sort.js
index 8d15a1a5fe9..c484fee4559 100644
--- a/lib/js/sort.js
+++ b/lib/js/sort.js
@@ -13,14 +13,14 @@ function merge(order, l1, l2) {
   var h1 = l1.hd;
   if (Curry._2(order, h1, h2)) {
     return {
-            hd: h1,
-            tl: merge(order, l1.tl, l2)
-          };
+      hd: h1,
+      tl: merge(order, l1.tl, l2)
+    };
   } else {
     return {
-            hd: h2,
-            tl: merge(order, l1, l2.tl)
-          };
+      hd: h2,
+      tl: merge(order, l1, l2.tl)
+    };
   }
 }
 
@@ -33,30 +33,30 @@ function list(order, l) {
     var e = param.hd;
     if (!match) {
       return {
-              hd: {
-                hd: e,
-                tl: /* [] */0
-              },
-              tl: /* [] */0
-            };
+        hd: {
+          hd: e,
+          tl: /* [] */0
+        },
+        tl: /* [] */0
+      };
     }
     var e2 = match.hd;
     return {
-            hd: Curry._2(order, e, e2) ? ({
-                  hd: e,
-                  tl: {
-                    hd: e2,
-                    tl: /* [] */0
-                  }
-                }) : ({
-                  hd: e2,
-                  tl: {
-                    hd: e,
-                    tl: /* [] */0
-                  }
-                }),
-            tl: initlist(match.tl)
-          };
+      hd: Curry._2(order, e, e2) ? ({
+          hd: e,
+          tl: {
+            hd: e2,
+            tl: /* [] */0
+          }
+        }) : ({
+          hd: e2,
+          tl: {
+            hd: e,
+            tl: /* [] */0
+          }
+        }),
+      tl: initlist(match.tl)
+    };
   };
   var merge2 = function (param) {
     if (!param) {
@@ -65,9 +65,9 @@ function list(order, l) {
     var match = param.tl;
     if (match) {
       return {
-              hd: merge(order, param.hd, match.hd),
-              tl: merge2(match.tl)
-            };
+        hd: merge(order, param.hd, match.hd),
+        tl: merge2(match.tl)
+      };
     } else {
       return param;
     }
@@ -116,10 +116,10 @@ function array(cmp, arr) {
       var j = hi - 1 | 0;
       if (!Curry._2(cmp, pivot, arr[hi]) || !Curry._2(cmp, arr[lo], pivot)) {
         throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Sort.array",
-              Error: new Error()
-            };
+          RE_EXN_ID: "Invalid_argument",
+          _1: "Sort.array",
+          Error: new Error()
+        };
       }
       while(i < j) {
         while(!Curry._2(cmp, pivot, arr[i])) {
diff --git a/lib/js/stack.js b/lib/js/stack.js
index 7105eee48b7..78ed5464498 100644
--- a/lib/js/stack.js
+++ b/lib/js/stack.js
@@ -7,9 +7,9 @@ var Empty = /* @__PURE__ */Caml_exceptions.create("Stack.Empty");
 
 function create(param) {
   return {
-          c: /* [] */0,
-          len: 0
-        };
+    c: /* [] */0,
+    len: 0
+  };
 }
 
 function clear(s) {
@@ -19,9 +19,9 @@ function clear(s) {
 
 function copy(s) {
   return {
-          c: s.c,
-          len: s.len
-        };
+    c: s.c,
+    len: s.len
+  };
 }
 
 function push(x, s) {
@@ -40,9 +40,9 @@ function pop(s) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function top(s) {
@@ -51,9 +51,9 @@ function top(s) {
     return match.hd;
   }
   throw {
-        RE_EXN_ID: Empty,
-        Error: new Error()
-      };
+    RE_EXN_ID: Empty,
+    Error: new Error()
+  };
 }
 
 function is_empty(s) {
diff --git a/lib/js/stream.js b/lib/js/stream.js
index eb16b9e0a1e..c661f3b27f5 100644
--- a/lib/js/stream.js
+++ b/lib/js/stream.js
@@ -46,24 +46,24 @@ function get_data(count, _d) {
           }
           if (match.TAG === "Scons") {
             return {
-                    TAG: "Scons",
-                    _0: match._0,
-                    _1: {
-                      TAG: "Sapp",
-                      _0: match._1,
-                      _1: d2
-                    }
-                  };
+              TAG: "Scons",
+              _0: match._0,
+              _1: {
+                TAG: "Sapp",
+                _0: match._1,
+                _1: d2
+              }
+            };
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "stream.res",
-                  53,
-                  13
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "stream.res",
+              53,
+              13
+            ],
+            Error: new Error()
+          };
       case "Slazy" :
           _d = CamlinternalLazy.force(d._0);
           continue ;
@@ -75,10 +75,10 @@ function get_data(count, _d) {
             if (a !== undefined) {
               g.curr = undefined;
               return {
-                      TAG: "Scons",
-                      _0: Caml_option.valFromOption(a),
-                      _1: d
-                    };
+                TAG: "Scons",
+                _0: Caml_option.valFromOption(a),
+                _1: d
+              };
             } else {
               return "Sempty";
             }
@@ -86,10 +86,10 @@ function get_data(count, _d) {
           var a$1 = Curry._1(g.func, count);
           if (a$1 !== undefined) {
             return {
-                    TAG: "Scons",
-                    _0: Caml_option.valFromOption(a$1),
-                    _1: d
-                  };
+              TAG: "Scons",
+              _0: Caml_option.valFromOption(a$1),
+              _1: d
+            };
           } else {
             g.curr = Caml_option.some(undefined);
             return "Sempty";
@@ -118,14 +118,14 @@ function peek_data(s) {
             return Caml_option.some(d._0);
           }
           throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "stream.res",
-                  83,
-                  13
-                ],
-                Error: new Error()
-              };
+            RE_EXN_ID: "Assert_failure",
+            _1: [
+              "stream.res",
+              83,
+              13
+            ],
+            Error: new Error()
+          };
       case "Slazy" :
           s.data = CamlinternalLazy.force(f._0);
           continue ;
@@ -190,34 +190,34 @@ function junk(param) {
 function nget_data(n, s) {
   if (n <= 0) {
     return [
-            /* [] */0,
-            s.data,
-            0
-          ];
+      /* [] */0,
+      s.data,
+      0
+    ];
   }
   var a = peek_data(s);
   if (a === undefined) {
     return [
-            /* [] */0,
-            s.data,
-            0
-          ];
+      /* [] */0,
+      s.data,
+      0
+    ];
   }
   var a$1 = Caml_option.valFromOption(a);
   junk_data(s);
   var match = nget_data(n - 1 | 0, s);
   return [
-          {
-            hd: a$1,
-            tl: match[0]
-          },
-          {
-            TAG: "Scons",
-            _0: a$1,
-            _1: match[1]
-          },
-          match[2] + 1 | 0
-        ];
+    {
+      hd: a$1,
+      tl: match[0]
+    },
+    {
+      TAG: "Scons",
+      _0: a$1,
+      _1: match[1]
+    },
+    match[2] + 1 | 0
+  ];
 }
 
 function npeek(n, param) {
@@ -238,9 +238,9 @@ function next(s) {
     return Caml_option.valFromOption(a);
   }
   throw {
-        RE_EXN_ID: Failure,
-        Error: new Error()
-      };
+    RE_EXN_ID: Failure,
+    Error: new Error()
+  };
 }
 
 function empty(s) {
@@ -249,9 +249,9 @@ function empty(s) {
     return;
   }
   throw {
-        RE_EXN_ID: Failure,
-        Error: new Error()
-      };
+    RE_EXN_ID: Failure,
+    Error: new Error()
+  };
 }
 
 function iter(f, strm) {
@@ -270,28 +270,28 @@ function iter(f, strm) {
 
 function from(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Sgen",
-            _0: {
-              curr: undefined,
-              func: f
-            }
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Sgen",
+      _0: {
+        curr: undefined,
+        func: f
+      }
+    }
+  };
 }
 
 function of_list(l) {
   return {
-          count: 0,
-          data: List.fold_right((function (x, l) {
-                  return {
-                          TAG: "Scons",
-                          _0: x,
-                          _1: l
-                        };
-                }), l, "Sempty")
-        };
+    count: 0,
+    data: List.fold_right((function (x, l) {
+            return {
+              TAG: "Scons",
+              _0: x,
+              _1: l
+            };
+          }), l, "Sempty")
+  };
 }
 
 function of_string(s) {
@@ -299,13 +299,13 @@ function of_string(s) {
     contents: 0
   };
   return from(function (param) {
-              var c = count.contents;
-              if (c < s.length) {
-                count.contents = count.contents + 1 | 0;
-                return Caml_string.get(s, c);
-              }
-              
-            });
+        var c = count.contents;
+        if (c < s.length) {
+          count.contents = count.contents + 1 | 0;
+          return Caml_string.get(s, c);
+        }
+        
+      });
 }
 
 function of_bytes(s) {
@@ -313,106 +313,106 @@ function of_bytes(s) {
     contents: 0
   };
   return from(function (param) {
-              var c = count.contents;
-              if (c < s.length) {
-                count.contents = count.contents + 1 | 0;
-                return Caml_bytes.get(s, c);
-              }
-              
-            });
+        var c = count.contents;
+        if (c < s.length) {
+          count.contents = count.contents + 1 | 0;
+          return Caml_bytes.get(s, c);
+        }
+        
+      });
 }
 
 function iapp(i, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Sapp",
-            _0: data(i),
-            _1: data(s)
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Sapp",
+      _0: data(i),
+      _1: data(s)
+    }
+  };
 }
 
 function icons(i, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Scons",
-            _0: i,
-            _1: data(s)
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Scons",
+      _0: i,
+      _1: data(s)
+    }
+  };
 }
 
 function ising(i) {
   return {
-          count: 0,
-          data: {
-            TAG: "Scons",
-            _0: i,
-            _1: "Sempty"
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Scons",
+      _0: i,
+      _1: "Sempty"
+    }
+  };
 }
 
 function lapp(f, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Sapp",
-                          _0: data(Curry._1(f, undefined)),
-                          _1: data(s)
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Sapp",
+              _0: data(Curry._1(f, undefined)),
+              _1: data(s)
+            };
+          })
+    }
+  };
 }
 
 function lcons(f, s) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Scons",
-                          _0: Curry._1(f, undefined),
-                          _1: data(s)
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Scons",
+              _0: Curry._1(f, undefined),
+              _1: data(s)
+            };
+          })
+    }
+  };
 }
 
 function lsing(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return {
-                          TAG: "Scons",
-                          _0: Curry._1(f, undefined),
-                          _1: "Sempty"
-                        };
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return {
+              TAG: "Scons",
+              _0: Curry._1(f, undefined),
+              _1: "Sempty"
+            };
+          })
+    }
+  };
 }
 
 function slazy(f) {
   return {
-          count: 0,
-          data: {
-            TAG: "Slazy",
-            _0: CamlinternalLazy.from_fun(function () {
-                  return data(Curry._1(f, undefined));
-                })
-          }
-        };
+    count: 0,
+    data: {
+      TAG: "Slazy",
+      _0: CamlinternalLazy.from_fun(function () {
+            return data(Curry._1(f, undefined));
+          })
+    }
+  };
 }
 
 function dump_data(f, param) {
diff --git a/lib/js/string.js b/lib/js/string.js
index aeb5ed11d91..62c45a7cd14 100644
--- a/lib/js/string.js
+++ b/lib/js/string.js
@@ -92,9 +92,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -130,10 +130,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -142,10 +142,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -155,9 +155,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -174,10 +174,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -203,10 +203,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -215,10 +215,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -240,10 +240,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
@@ -294,9 +294,9 @@ function split_on_char(sep, s) {
     
   }
   return {
-          hd: sub(s, 0, j),
-          tl: r
-        };
+    hd: sub(s, 0, j),
+    tl: r
+  };
 }
 
 var make = Caml_string.make;
diff --git a/lib/js/stringLabels.js b/lib/js/stringLabels.js
index 57e01cbf612..d8c07b0e502 100644
--- a/lib/js/stringLabels.js
+++ b/lib/js/stringLabels.js
@@ -94,9 +94,9 @@ function index_rec(s, lim, _i, c) {
     var i = _i;
     if (i >= lim) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -132,10 +132,10 @@ function index_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from / Bytes.index_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from / Bytes.index_from",
+      Error: new Error()
+    };
   }
   return index_rec(s, l, i, c);
 }
@@ -144,10 +144,10 @@ function index_from_opt(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.index_from_opt / Bytes.index_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.index_from_opt / Bytes.index_from_opt",
+      Error: new Error()
+    };
   }
   return index_rec_opt(s, l, i, c);
 }
@@ -157,9 +157,9 @@ function rindex_rec(s, _i, c) {
     var i = _i;
     if (i < 0) {
       throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
+        RE_EXN_ID: "Not_found",
+        Error: new Error()
+      };
     }
     if (s.codePointAt(i) === c) {
       return i;
@@ -176,10 +176,10 @@ function rindex(s, c) {
 function rindex_from(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from / Bytes.rindex_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from / Bytes.rindex_from",
+      Error: new Error()
+    };
   }
   return rindex_rec(s, i, c);
 }
@@ -205,10 +205,10 @@ function rindex_opt(s, c) {
 function rindex_from_opt(s, i, c) {
   if (i < -1 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rindex_from_opt / Bytes.rindex_from_opt",
+      Error: new Error()
+    };
   }
   return rindex_rec_opt(s, i, c);
 }
@@ -217,10 +217,10 @@ function contains_from(s, i, c) {
   var l = s.length;
   if (i < 0 || i > l) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.contains_from / Bytes.contains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.contains_from / Bytes.contains_from",
+      Error: new Error()
+    };
   }
   try {
     index_rec(s, l, i, c);
@@ -242,10 +242,10 @@ function contains(s, c) {
 function rcontains_from(s, i, c) {
   if (i < 0 || i >= s.length) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "String.rcontains_from / Bytes.rcontains_from",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "String.rcontains_from / Bytes.rcontains_from",
+      Error: new Error()
+    };
   }
   try {
     rindex_rec(s, i, c);
@@ -296,9 +296,9 @@ function split_on_char(sep, s) {
     
   }
   return {
-          hd: sub(s, 0, j),
-          tl: r
-        };
+    hd: sub(s, 0, j),
+    tl: r
+  };
 }
 
 var make = Caml_string.make;
diff --git a/lib/js/uchar.js b/lib/js/uchar.js
index a9de3eabe4e..6f3ea686314 100644
--- a/lib/js/uchar.js
+++ b/lib/js/uchar.js
@@ -17,10 +17,10 @@ function succ(u) {
   }
   if (u === 1114111) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "U+10FFFF has no successor",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "U+10FFFF has no successor",
+      Error: new Error()
+    };
   }
   return u + 1 | 0;
 }
@@ -31,10 +31,10 @@ function pred(u) {
   }
   if (u === 0) {
     throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "U+0000 has no predecessor",
-          Error: new Error()
-        };
+      RE_EXN_ID: "Invalid_argument",
+      _1: "U+0000 has no predecessor",
+      Error: new Error()
+    };
   }
   return u - 1 | 0;
 }
@@ -55,10 +55,10 @@ function of_int(i) {
   }
   var s = err_not_sv(i);
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function is_char(u) {
@@ -75,10 +75,10 @@ function to_char(u) {
   }
   var s = err_not_latin1(u);
   throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
+    RE_EXN_ID: "Invalid_argument",
+    _1: s,
+    Error: new Error()
+  };
 }
 
 function unsafe_to_char(prim) {